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/mm/init_64.c | |
| parent | bfa274e2436fc7ef72ef51c878083647f1cfd429 (diff) | |
| parent | 74b20dad1c4cc0fd13ceca62fbab808919e1a7ea (diff) | |
| download | talos-op-linux-f8303dd3db57bd7ab2062985ad7a9e898a8ac423.tar.gz talos-op-linux-f8303dd3db57bd7ab2062985ad7a9e898a8ac423.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/lmb-2.6
Diffstat (limited to 'arch/powerpc/mm/init_64.c')
| -rw-r--r-- | arch/powerpc/mm/init_64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/mm/init_64.c b/arch/powerpc/mm/init_64.c index c0f5cff77035..abeb0eb79313 100644 --- a/arch/powerpc/mm/init_64.c +++ b/arch/powerpc/mm/init_64.c @@ -38,11 +38,11 @@ #include <linux/nodemask.h> #include <linux/module.h> #include <linux/poison.h> +#include <linux/lmb.h> #include <asm/pgalloc.h> #include <asm/page.h> #include <asm/prom.h> -#include <asm/lmb.h> #include <asm/rtas.h> #include <asm/io.h> #include <asm/mmu_context.h> |
