Skip to contentSkip to conversation

4xx; Replace #includes of asm/of_platform.h with linux/of_platform.h.

PATCH In review Jon Loeliger 3 participants 4 messages Nov 5, 2007 – Nov 6, 2007

Subsystems (2)
PowerPC Linux for PowerPC embedded PPC4XX
lore
Share & tools
lore

Jon Loeliger

author
#0 lore raw

PATCH 1/1 4xx; Replace #includes of asm/of_platform.h with linux/of_platform.h.

From: Jon Loeliger <[email protected]>

Signed-off-by Jon Loeliger <[email protected]>

---
Chip away at some janitor work.

 arch/powerpc/platforms/40x/walnut.c  |    3 ++-
 arch/powerpc/platforms/44x/bamboo.c  |    3 ++-
 arch/powerpc/platforms/44x/ebony.c   |    3 ++-
 arch/powerpc/platforms/44x/sequoia.c |    3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)
arch/powerpc/platforms/40x/walnut.c +2 -1
index eb0c136..ff6db24 100644
@@ -17,12 +17,13 @@
  */
 
 #include <linux/init.h>
+#include <linux/of_platform.h>
+
 #include <asm/machdep.h>
 #include <asm/prom.h>
 #include <asm/udbg.h>
 #include <asm/time.h>
 #include <asm/uic.h>
-#include <asm/of_platform.h>
 
 static struct of_device_id walnut_of_bus[] = {
 	{ .compatible = "ibm,plb3", },
arch/powerpc/platforms/44x/bamboo.c +2 -1
index 470e1a3..be23f11 100644
@@ -14,12 +14,13 @@
  * option) any later version.
  */
 #include <linux/init.h>
+#include <linux/of_platform.h>
+
 #include <asm/machdep.h>
 #include <asm/prom.h>
 #include <asm/udbg.h>
 #include <asm/time.h>
 #include <asm/uic.h>
-#include <asm/of_platform.h>
 #include "44x.h"
 
 static struct of_device_id bamboo_of_bus[] = {
arch/powerpc/platforms/44x/ebony.c +2 -1
index 40e18fc..6cd3476 100644
@@ -17,12 +17,13 @@
  */
 
 #include <linux/init.h>
+#include <linux/of_platform.h>
+
 #include <asm/machdep.h>
 #include <asm/prom.h>
 #include <asm/udbg.h>
 #include <asm/time.h>
 #include <asm/uic.h>
-#include <asm/of_platform.h>
 
 #include "44x.h"
arch/powerpc/platforms/44x/sequoia.c +2 -1
index 30700b3..21a9dd1 100644
@@ -14,12 +14,13 @@
  * option) any later version.
  */
 #include <linux/init.h>
+#include <linux/of_platform.h>
+
 #include <asm/machdep.h>
 #include <asm/prom.h>
 #include <asm/udbg.h>
 #include <asm/time.h>
 #include <asm/uic.h>
-#include <asm/of_platform.h>
 #include "44x.h"
 
 static struct of_device_id sequoia_of_bus[] = {
Signature · 1 line
1.5.3
#3 lore raw
Quoted 3 lines · On Mon, 5 Nov 2007 17:53:41 -0600 Josh Boyer <[email protected]> wrote:

Yeah, this is fine with me too. But why haven't we put a #warning in asm/of_platform.h and asm/prom.h?

Because thee are way to many places to be fixed yet. And asm/prom.h needs to be explicitly included if you want to use the flattened device tree accessors.

Signature · 3 lines
Cheers,
Stephen Rothwell                    [email protected]
http://www.canb.auug.org.au/~sfr/