From 7ffe747aa48b800577698c9f75a3ad2d8f18ea32 Mon Sep 17 00:00:00 2001
From: Jon Loeliger <jdl@freescale.com>
Date: Tue, 6 Nov 2007 12:11:13 -0600
Subject: [PATCH] --- yaml --- r: 81047 b: refs/heads/master c:
 882407b9795d65dff64c95d65c6b66502c3153fb h: refs/heads/master i:   81045:
 8bb1111940116a6574cad1bef426e10a449cf088   81043:
 ff805e139283a50389bfad4fabbde301a91b9993   81039:
 ac1ff1ca6a6bc8e897beaffdc5a9dbb017ce3de8 v: v3

---
 [refs]                                          | 2 +-
 trunk/arch/powerpc/platforms/82xx/pq2fads.c     | 2 +-
 trunk/arch/powerpc/platforms/83xx/mpc832x_mds.c | 4 ++--
 trunk/arch/powerpc/platforms/83xx/mpc832x_rdb.c | 2 +-
 trunk/arch/powerpc/platforms/83xx/mpc836x_mds.c | 4 ++--
 trunk/arch/powerpc/platforms/85xx/mpc85xx_mds.c | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 4f71b735c8be..08bcafbe824b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c1469f13de275fc92b051328ea5764a32a5a43c9
+refs/heads/master: 882407b9795d65dff64c95d65c6b66502c3153fb
diff --git a/trunk/arch/powerpc/platforms/82xx/pq2fads.c b/trunk/arch/powerpc/platforms/82xx/pq2fads.c
index 4f457a9c79ae..1be500501806 100644
--- a/trunk/arch/powerpc/platforms/82xx/pq2fads.c
+++ b/trunk/arch/powerpc/platforms/82xx/pq2fads.c
@@ -15,12 +15,12 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/fsl_devices.h>
+#include <linux/of_platform.h>
 
 #include <asm/io.h>
 #include <asm/cpm2.h>
 #include <asm/udbg.h>
 #include <asm/machdep.h>
-#include <asm/of_platform.h>
 #include <asm/time.h>
 
 #include <sysdev/fsl_soc.h>
diff --git a/trunk/arch/powerpc/platforms/83xx/mpc832x_mds.c b/trunk/arch/powerpc/platforms/83xx/mpc832x_mds.c
index 39ee7a13b25a..1e570bb947fc 100644
--- a/trunk/arch/powerpc/platforms/83xx/mpc832x_mds.c
+++ b/trunk/arch/powerpc/platforms/83xx/mpc832x_mds.c
@@ -23,9 +23,9 @@
 #include <linux/seq_file.h>
 #include <linux/root_dev.h>
 #include <linux/initrd.h>
+#include <linux/of_platform.h>
+#include <linux/of_device.h>
 
-#include <asm/of_device.h>
-#include <asm/of_platform.h>
 #include <asm/system.h>
 #include <asm/atomic.h>
 #include <asm/time.h>
diff --git a/trunk/arch/powerpc/platforms/83xx/mpc832x_rdb.c b/trunk/arch/powerpc/platforms/83xx/mpc832x_rdb.c
index d4bd04001b99..ffb2e9361ce3 100644
--- a/trunk/arch/powerpc/platforms/83xx/mpc832x_rdb.c
+++ b/trunk/arch/powerpc/platforms/83xx/mpc832x_rdb.c
@@ -19,8 +19,8 @@
 #include <linux/spi/spi.h>
 #include <linux/spi/mmc_spi.h>
 #include <linux/mmc/host.h>
+#include <linux/of_platform.h>
 
-#include <asm/of_platform.h>
 #include <asm/time.h>
 #include <asm/ipic.h>
 #include <asm/udbg.h>
diff --git a/trunk/arch/powerpc/platforms/83xx/mpc836x_mds.c b/trunk/arch/powerpc/platforms/83xx/mpc836x_mds.c
index e40012f8f488..2ac9890b763c 100644
--- a/trunk/arch/powerpc/platforms/83xx/mpc836x_mds.c
+++ b/trunk/arch/powerpc/platforms/83xx/mpc836x_mds.c
@@ -29,9 +29,9 @@
 #include <linux/seq_file.h>
 #include <linux/root_dev.h>
 #include <linux/initrd.h>
+#include <linux/of_platform.h>
+#include <linux/of_device.h>
 
-#include <asm/of_device.h>
-#include <asm/of_platform.h>
 #include <asm/system.h>
 #include <asm/atomic.h>
 #include <asm/time.h>
diff --git a/trunk/arch/powerpc/platforms/85xx/mpc85xx_mds.c b/trunk/arch/powerpc/platforms/85xx/mpc85xx_mds.c
index 61b3eedf41b9..e6c63a5b1efb 100644
--- a/trunk/arch/powerpc/platforms/85xx/mpc85xx_mds.c
+++ b/trunk/arch/powerpc/platforms/85xx/mpc85xx_mds.c
@@ -30,9 +30,9 @@
 #include <linux/initrd.h>
 #include <linux/module.h>
 #include <linux/fsl_devices.h>
+#include <linux/of_platform.h>
+#include <linux/of_device.h>
 
-#include <asm/of_device.h>
-#include <asm/of_platform.h>
 #include <asm/system.h>
 #include <asm/atomic.h>
 #include <asm/time.h>