diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-02-26 11:08:45 +0100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-02-26 11:08:45 +0100 |
| commit | f8303dd3db57bd7ab2062985ad7a9e898a8ac423 (patch) | |
| tree | b92086100ed44c8647dba61a21e560923daa336a /arch/powerpc/kernel/setup-common.c | |
| parent | Linux 2.6.25-rc3 (diff) | |
| parent | [LMB]: Fix lmb_add_region if region should be added at the head (diff) | |
| download | linux-f8303dd3db57bd7ab2062985ad7a9e898a8ac423.tar.xz linux-f8303dd3db57bd7ab2062985ad7a9e898a8ac423.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/lmb-2.6
Diffstat (limited to 'arch/powerpc/kernel/setup-common.c')
| -rw-r--r-- | arch/powerpc/kernel/setup-common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c index 6adb5a1e98bb..12cc41c16b0d 100644 --- a/arch/powerpc/kernel/setup-common.c +++ b/arch/powerpc/kernel/setup-common.c @@ -34,6 +34,7 @@ #include <linux/serial_8250.h> #include <linux/debugfs.h> #include <linux/percpu.h> +#include <linux/lmb.h> #include <asm/io.h> #include <asm/prom.h> #include <asm/processor.h> @@ -56,7 +57,6 @@ #include <asm/cache.h> #include <asm/page.h> #include <asm/mmu.h> -#include <asm/lmb.h> #include <asm/xmon.h> #include <asm/cputhreads.h> |