diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-02-26 05:08:45 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-02-26 05:08:45 -0500 |
| commit | f8303dd3db57bd7ab2062985ad7a9e898a8ac423 (patch) | |
| tree | b92086100ed44c8647dba61a21e560923daa336a /arch/powerpc/kernel/vdso.c | |
| parent | bfa274e2436fc7ef72ef51c878083647f1cfd429 (diff) | |
| parent | 74b20dad1c4cc0fd13ceca62fbab808919e1a7ea (diff) | |
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 d3437c4c4a6f..c21a626af676 100644 --- a/arch/powerpc/kernel/vdso.c +++ b/arch/powerpc/kernel/vdso.c | |||
| @@ -21,13 +21,14 @@ | |||
| 21 | #include <linux/elf.h> | 21 | #include <linux/elf.h> |
| 22 | #include <linux/security.h> | 22 | #include <linux/security.h> |
| 23 | #include <linux/bootmem.h> | 23 | #include <linux/bootmem.h> |
| 24 | #include <linux/lmb.h> | ||
| 24 | 25 | ||
| 25 | #include <asm/pgtable.h> | 26 | #include <asm/pgtable.h> |
| 26 | #include <asm/system.h> | 27 | #include <asm/system.h> |
| 27 | #include <asm/processor.h> | 28 | #include <asm/processor.h> |
| 28 | #include <asm/mmu.h> | 29 | #include <asm/mmu.h> |
| 29 | #include <asm/mmu_context.h> | 30 | #include <asm/mmu_context.h> |
| 30 | #include <asm/lmb.h> | 31 | #include <asm/prom.h> |
| 31 | #include <asm/machdep.h> | 32 | #include <asm/machdep.h> |
| 32 | #include <asm/cputable.h> | 33 | #include <asm/cputable.h> |
| 33 | #include <asm/sections.h> | 34 | #include <asm/sections.h> |