From 9dc6004cdeb16f73d6a6d2c4fecc6a6935c66680 Mon Sep 17 00:00:00 2001
From: Jon Loeliger <jdl@freescale.com>
Date: Wed, 14 Nov 2007 04:13:03 +1100
Subject: [PATCH] --- yaml --- r: 80990 b: refs/heads/master c:
 5f867dc7989023935317d0dc5c04215ea0592bfc h: refs/heads/master v: v3

---
 [refs]                                           | 2 +-
 trunk/arch/powerpc/platforms/embedded6xx/holly.c | 2 +-
 trunk/arch/powerpc/platforms/pasemi/gpio_mdio.c  | 2 +-
 trunk/arch/powerpc/platforms/pasemi/setup.c      | 2 +-
 trunk/arch/powerpc/platforms/powermac/setup.c    | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 440ce754336f..8f6b44986dca 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cc1bf182bb8451a036a7c227f0a95a0416c4736e
+refs/heads/master: 5f867dc7989023935317d0dc5c04215ea0592bfc
diff --git a/trunk/arch/powerpc/platforms/embedded6xx/holly.c b/trunk/arch/powerpc/platforms/embedded6xx/holly.c
index b6de2b5223dd..ce91787f3c7c 100644
--- a/trunk/arch/powerpc/platforms/embedded6xx/holly.c
+++ b/trunk/arch/powerpc/platforms/embedded6xx/holly.c
@@ -26,6 +26,7 @@
 #include <linux/serial.h>
 #include <linux/tty.h>
 #include <linux/serial_core.h>
+#include <linux/of_platform.h>
 
 #include <asm/system.h>
 #include <asm/time.h>
@@ -39,7 +40,6 @@
 #include <asm/tsi108_irq.h>
 #include <asm/tsi108_pci.h>
 #include <asm/mpic.h>
-#include <asm/of_platform.h>
 
 #undef DEBUG
 
diff --git a/trunk/arch/powerpc/platforms/pasemi/gpio_mdio.c b/trunk/arch/powerpc/platforms/pasemi/gpio_mdio.c
index 04a8686e6084..b46542990cf8 100644
--- a/trunk/arch/powerpc/platforms/pasemi/gpio_mdio.c
+++ b/trunk/arch/powerpc/platforms/pasemi/gpio_mdio.c
@@ -30,7 +30,7 @@
 #include <linux/interrupt.h>
 #include <linux/phy.h>
 #include <linux/platform_device.h>
-#include <asm/of_platform.h>
+#include <linux/of_platform.h>
 
 #define DELAY 1
 
diff --git a/trunk/arch/powerpc/platforms/pasemi/setup.c b/trunk/arch/powerpc/platforms/pasemi/setup.c
index 2b638659d1ea..5748194a667f 100644
--- a/trunk/arch/powerpc/platforms/pasemi/setup.c
+++ b/trunk/arch/powerpc/platforms/pasemi/setup.c
@@ -27,6 +27,7 @@
 #include <linux/delay.h>
 #include <linux/console.h>
 #include <linux/pci.h>
+#include <linux/of_platform.h>
 
 #include <asm/prom.h>
 #include <asm/system.h>
@@ -35,7 +36,6 @@
 #include <asm/mpic.h>
 #include <asm/smp.h>
 #include <asm/time.h>
-#include <asm/of_platform.h>
 
 #include <pcmcia/ss.h>
 #include <pcmcia/cistpl.h>
diff --git a/trunk/arch/powerpc/platforms/powermac/setup.c b/trunk/arch/powerpc/platforms/powermac/setup.c
index 02c533096627..3acb59d5cdf5 100644
--- a/trunk/arch/powerpc/platforms/powermac/setup.c
+++ b/trunk/arch/powerpc/platforms/powermac/setup.c
@@ -51,6 +51,8 @@
 #include <linux/root_dev.h>
 #include <linux/bitops.h>
 #include <linux/suspend.h>
+#include <linux/of_device.h>
+#include <linux/of_platform.h>
 
 #include <asm/reg.h>
 #include <asm/sections.h>
@@ -68,8 +70,6 @@
 #include <asm/btext.h>
 #include <asm/pmac_feature.h>
 #include <asm/time.h>
-#include <asm/of_device.h>
-#include <asm/of_platform.h>
 #include <asm/mmu_context.h>
 #include <asm/iommu.h>
 #include <asm/smu.h>