Merge acpi-2.6.12 to-akpm

[sfrench/cifs-2.6.git] / arch / ppc / syslib / cpm2_common.c

diff --git a/arch/ppc/syslib/cpm2_common.c b/arch/ppc/syslib/cpm2_common.c
index 4c19a4ac7163134340b63077fb3df29b2312c6e0..cbac44b1620cc3cc7313b2127e1999e2472a422c 100644 (file)
--- a/arch/ppc/syslib/cpm2_common.c
+++ b/arch/ppc/syslib/cpm2_common.c
@@ -27,7 +27,6 @@
 #include <asm/mpc8260.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>
-#include <asm/immap_cpm2.h>
 #include <asm/cpm2.h>
 #include <asm/rheap.h>