summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/prom.c
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2008-02-26 21:08:45 +1100
committerPaul Mackerras <paulus@samba.org>2008-02-26 21:08:45 +1100
commitf8303dd3db57bd7ab2062985ad7a9e898a8ac423 (patch)
treeb92086100ed44c8647dba61a21e560923daa336a /arch/powerpc/kernel/prom.c
parentbfa274e2436fc7ef72ef51c878083647f1cfd429 (diff)
parent74b20dad1c4cc0fd13ceca62fbab808919e1a7ea (diff)
downloadop-kernel-dev-f8303dd3db57bd7ab2062985ad7a9e898a8ac423.zip
op-kernel-dev-f8303dd3db57bd7ab2062985ad7a9e898a8ac423.tar.gz
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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index eac97f4..ff600ef 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>
OpenPOWER on IntegriCloud