diff --git a/[refs] b/[refs]
index db6d24baaabe..4cd17306d530 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 757569295d4204b4e00dd9294790e09ed5a2ffd2
+refs/heads/master: c64d7b4cea71b6841d9d96d390aed323c9fe1c9d
diff --git a/trunk/arch/ppc/platforms/tqm8260_setup.c b/trunk/arch/ppc/platforms/tqm8260_setup.c
index a8880bfc034b..3409139330b1 100644
--- a/trunk/arch/ppc/platforms/tqm8260_setup.c
+++ b/trunk/arch/ppc/platforms/tqm8260_setup.c
@@ -16,8 +16,8 @@
 
 #include <linux/init.h>
 
-#include <asm/immap_cpm2.h>
 #include <asm/mpc8260.h>
+#include <asm/cpm2.h>
 #include <asm/machdep.h>
 
 static int