---

yaml --- r: 5145 b: refs/heads/master c: c64d7b4 h: refs/heads/master i: 5143: d648a68 v: v3
git-mirror · Jul 27, 2005 · 82ecc55 · 82ecc55
1 parent 32ea301
commit 82ecc55
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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