Merge remote branch 'nouveau/for-airlied' of ../drm-nouveau-next into drm-core-next

[sfrench/cifs-2.6.git] / arch / powerpc / kernel / crash.c

diff --git a/arch/powerpc/kernel/crash.c b/arch/powerpc/kernel/crash.c
index 29df48f2b61a45d27f33301fe350439a94e384f4..417f7b05a9cebc6e10acfaf41eec88d17a2f7e89 100644 (file)
--- a/arch/powerpc/kernel/crash.c
+++ b/arch/powerpc/kernel/crash.c
@@ -24,7 +24,7 @@
 #include <linux/init.h>
 #include <linux/irq.h>
 #include <linux/types.h>
-#include <linux/lmb.h>
+#include <linux/memblock.h>
 
 #include <asm/processor.h>
 #include <asm/machdep.h>