summaryrefslogtreecommitdiff
path: root/arch/blackfin/include/asm/page.h
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2009-06-19 02:20:55 +0400
committerJames Morris <jmorris@namei.org>2009-06-19 02:20:55 +0400
commitd905163c5b23f6d8511971e06081a1b525e8a0bd (patch)
treef76918c1be802ec068d37763466f5518efdb690e /arch/blackfin/include/asm/page.h
parent44c2d9bdd7022ca7d240d5adc009296fc1c6ce08 (diff)
parent0732f87761dbe417cb6e084b712d07e879e876ef (diff)
downloadlinux-d905163c5b23f6d8511971e06081a1b525e8a0bd.tar.xz
Merge branch 'master' into next
Diffstat (limited to 'arch/blackfin/include/asm/page.h')
-rw-r--r--arch/blackfin/include/asm/page.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/blackfin/include/asm/page.h b/arch/blackfin/include/asm/page.h
index 344f6a8c1f22..3ea2016a1d4a 100644
--- a/arch/blackfin/include/asm/page.h
+++ b/arch/blackfin/include/asm/page.h
@@ -81,7 +81,7 @@ extern unsigned long memory_end;
#define virt_addr_valid(kaddr) (((void *)(kaddr) >= (void *)PAGE_OFFSET) && \
((void *)(kaddr) < (void *)memory_end))
-#include <asm-generic/page.h>
+#include <asm-generic/getorder.h>
#endif /* __ASSEMBLY__ */