diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-02-26 21:08:45 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-02-26 21:08:45 +1100 |
| commit | f8303dd3db57bd7ab2062985ad7a9e898a8ac423 (patch) | |
| tree | b92086100ed44c8647dba61a21e560923daa336a /arch/powerpc/kernel/vdso.c | |
| parent | bfa274e2436fc7ef72ef51c878083647f1cfd429 (diff) | |
| parent | 74b20dad1c4cc0fd13ceca62fbab808919e1a7ea (diff) | |
| download | kernel_goldelico_gta04-f8303dd3db57bd7ab2062985ad7a9e898a8ac423.zip kernel_goldelico_gta04-f8303dd3db57bd7ab2062985ad7a9e898a8ac423.tar.gz kernel_goldelico_gta04-f8303dd3db57bd7ab2062985ad7a9e898a8ac423.tar.bz2 | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/lmb-2.6
Diffstat (limited to 'arch/powerpc/kernel/vdso.c')
| -rw-r--r-- | arch/powerpc/kernel/vdso.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c index d3437c4..c21a626 100644 --- a/arch/powerpc/kernel/vdso.c +++ b/arch/powerpc/kernel/vdso.c @@ -21,13 +21,14 @@ #include <linux/elf.h> #include <linux/security.h> #include <linux/bootmem.h> +#include <linux/lmb.h> #include <asm/pgtable.h> #include <asm/system.h> #include <asm/processor.h> #include <asm/mmu.h> #include <asm/mmu_context.h> -#include <asm/lmb.h> +#include <asm/prom.h> #include <asm/machdep.h> #include <asm/cputable.h> #include <asm/sections.h> |