projects
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
[linux-2.6]
/
include
/
asm-frv
/
page.h
diff --git
a/include/asm-frv/page.h
b/include/asm-frv/page.h
index
134cc0c
..
213d92f
100644
(file)
--- a/
include/asm-frv/page.h
+++ b/
include/asm-frv/page.h
@@
-76,8
+76,6
@@
extern unsigned long max_pfn;
#endif /* __ASSEMBLY__ */
-#endif /* __KERNEL__ */
-
#ifdef CONFIG_CONTIGUOUS_PAGE_ALLOC
#define WANT_PAGE_VIRTUAL 1
#endif
@@
-85,4
+83,6
@@
extern unsigned long max_pfn;
#include <asm-generic/memory_model.h>
#include <asm-generic/page.h>
+#endif /* __KERNEL__ */
+
#endif /* _ASM_PAGE_H */