diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-06-02 16:33:24 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-06-02 16:33:24 +1000 |
| commit | 4c16e7043a10d3394e4d09b1471f2cf4829ae0df (patch) | |
| tree | a39dfb1227afa444658ace322433d74f0a555037 /arch/blackfin/include/asm/page.h | |
| parent | 74e806dd26d6f63cbadd8fdb3a836c13c2da40b2 (diff) | |
| parent | 09254cf49e0f3ea98a053bc3a6dab188f9a9a526 (diff) | |
Merge commit 'asm-generic/next'
Conflicts:
arch/arm/include/asm/page.h
Diffstat (limited to 'arch/blackfin/include/asm/page.h')
| -rw-r--r-- | arch/blackfin/include/asm/page.h | 2 |
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__ */ |