From 1e231d4bcec96d91e8facb7bab1810d9e3340f2f Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 23 May 2008 16:35:47 +1000
Subject: [PATCH] --- yaml --- r: 101819 b: refs/heads/master c:
 76ef7dd030823518506d65237a12666fc3f5a0d4 h: refs/heads/master i:   101817:
 a5f8e50c0404effc4e113d368e6bf7da717c209e   101815:
 c5ed0bd64f7948ab90052463ed895fe0becebc47 v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/spi/mpc52xx_psc_spi.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 0978f754f531..c9db80dc7a92 100644
--- 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
index 681d62325d3d..604e5f0a2d95 100644
--- 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