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/prom.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-dev-f8303dd3db57bd7ab2062985ad7a9e898a8ac423.tar.xz linux-dev-f8303dd3db57bd7ab2062985ad7a9e898a8ac423.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/lmb-2.6
Diffstat (limited to 'arch/powerpc/kernel/prom.c')
| -rw-r--r-- | arch/powerpc/kernel/prom.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c index eac97f48b9b8..ff600ef0b4d6 100644 --- a/arch/powerpc/kernel/prom.c +++ b/arch/powerpc/kernel/prom.c @@ -31,10 +31,10 @@ #include <linux/kexec.h> #include <linux/debugfs.h> #include <linux/irq.h> +#include <linux/lmb.h> #include <asm/prom.h> #include <asm/rtas.h> -#include <asm/lmb.h> #include <asm/page.h> #include <asm/processor.h> #include <asm/irq.h> |