---

yaml --- r: 101819 b: refs/heads/master c: 76ef7dd h: refs/heads/master i: 101817: a5f8e50 101815: c5ed0bd v: v3
git-mirror · Jul 12, 2008 · 1e231d4 · 1e231d4
1 parent d6254d3
commit 1e231d4
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: e6a9192d066b30353b78ce1647070c0c171dd9a7
+refs/heads/master: 76ef7dd030823518506d65237a12666fc3f5a0d4
diff --git a/trunk/drivers/spi/mpc52xx_psc_spi.c b/trunk/drivers/spi/mpc52xx_psc_spi.c
@@ -17,7 +17,7 @@
 #include <linux/interrupt.h>
 
 #if defined(CONFIG_PPC_MERGE)
-#include <asm/of_platform.h>
+#include <linux/of_platform.h>
 #else
 #include <linux/platform_device.h>
 #endif