diff options
| author | Linus Torvalds | 2008-10-20 22:21:24 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2008-10-20 22:21:24 +0200 |
| commit | 7110879cf2afbfb7af79675f5ff109e63d631c25 (patch) | |
| tree | 2a6c930ae90ad44002d045b91d335df634a26bb4 /arch/powerpc/include | |
| parent | Merge branch 'v28-timers-for-linus' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
| parent | m32r: fix build due to notify_cpu_starting() change (diff) | |
| download | kernel-qcow2-linux-7110879cf2afbfb7af79675f5ff109e63d631c25.tar.gz kernel-qcow2-linux-7110879cf2afbfb7af79675f5ff109e63d631c25.tar.xz kernel-qcow2-linux-7110879cf2afbfb7af79675f5ff109e63d631c25.zip | |
Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
m32r: fix build due to notify_cpu_starting() change
powerpc: fix linux-next build failure
Diffstat (limited to 'arch/powerpc/include')
| -rw-r--r-- | arch/powerpc/include/asm/page.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/page.h b/arch/powerpc/include/asm/page.h index 64e144505f65..5ac51e6efc1d 100644 --- a/arch/powerpc/include/asm/page.h +++ b/arch/powerpc/include/asm/page.h @@ -10,9 +10,13 @@ * 2 of the License, or (at your option) any later version. */ +#ifndef __ASSEMBLY__ +#include <linux/types.h> +#else +#include <asm/types.h> +#endif #include <asm/asm-compat.h> #include <asm/kdump.h> -#include <asm/types.h> /* * On PPC32 page size is 4K. For PPC64 we support either 4K or 64K software |