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/setup_64.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/setup_64.c')
| -rw-r--r-- | arch/powerpc/kernel/setup_64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c index 3b1529c103ef..2c2d8315193c 100644 --- a/arch/powerpc/kernel/setup_64.c +++ b/arch/powerpc/kernel/setup_64.c | |||
| @@ -33,6 +33,7 @@ | |||
| 33 | #include <linux/serial_8250.h> | 33 | #include <linux/serial_8250.h> |
| 34 | #include <linux/bootmem.h> | 34 | #include <linux/bootmem.h> |
| 35 | #include <linux/pci.h> | 35 | #include <linux/pci.h> |
| 36 | #include <linux/lmb.h> | ||
| 36 | #include <asm/io.h> | 37 | #include <asm/io.h> |
| 37 | #include <asm/kdump.h> | 38 | #include <asm/kdump.h> |
| 38 | #include <asm/prom.h> | 39 | #include <asm/prom.h> |
| @@ -55,7 +56,6 @@ | |||
| 55 | #include <asm/cache.h> | 56 | #include <asm/cache.h> |
| 56 | #include <asm/page.h> | 57 | #include <asm/page.h> |
| 57 | #include <asm/mmu.h> | 58 | #include <asm/mmu.h> |
| 58 | #include <asm/lmb.h> | ||
| 59 | #include <asm/firmware.h> | 59 | #include <asm/firmware.h> |
| 60 | #include <asm/xmon.h> | 60 | #include <asm/xmon.h> |
| 61 | #include <asm/udbg.h> | 61 | #include <asm/udbg.h> |