[PATCH] Use <linux/of_{platform, device}.h> and not <asm/...> variants.

Subsystems: linux for powerpc (32-bit and 64-bit), linux for powerpc embedded ppc4xx, the rest

STALE6803d

2 messages, 2 authors, 2008-01-08 · open the first message on its own page

[PATCH] Use <linux/of_{platform, device}.h> and not <asm/...> variants.

From: Jon Loeliger <hidden>
Date: 2008-01-07 18:07:19

From: Jon Loeliger <redacted>

Signed-off-by: Jon Loeliger <redacted>
---

Paul,

Continue to fight the Good Fight by removing
old include file references that managed to
creep in recently.

These are the last few in arch/powerpc directly.
If you could pick this up for .25, that be good!

jdl



 arch/powerpc/kernel/of_device.c      |    2 +-
 arch/powerpc/platforms/44x/rainier.c |    3 ++-
 arch/powerpc/platforms/maple/setup.c |    2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/arch/powerpc/kernel/of_device.c b/arch/powerpc/kernel/of_device.c
index 3388ad6..5748ddb 100644
--- a/arch/powerpc/kernel/of_device.c
+++ b/arch/powerpc/kernel/of_device.c
@@ -5,10 +5,10 @@
 #include <linux/module.h>
 #include <linux/mod_devicetable.h>
 #include <linux/slab.h>
+#include <linux/of_device.h>
 
 #include <asm/errno.h>
 #include <asm/dcr.h>
-#include <asm/of_device.h>
 
 static void of_device_make_bus_id(struct of_device *dev)
 {
diff --git a/arch/powerpc/platforms/44x/rainier.c b/arch/powerpc/platforms/44x/rainier.c
index a4ce5ba..a7fae1c 100644
--- a/arch/powerpc/platforms/44x/rainier.c
+++ b/arch/powerpc/platforms/44x/rainier.c
@@ -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 <asm/pci-bridge.h>
 #include "44x.h"
 
diff --git a/arch/powerpc/platforms/maple/setup.c b/arch/powerpc/platforms/maple/setup.c
index 144177d..3ce2d73 100644
--- a/arch/powerpc/platforms/maple/setup.c
+++ b/arch/powerpc/platforms/maple/setup.c
@@ -42,6 +42,7 @@
 #include <linux/serial.h>
 #include <linux/smp.h>
 #include <linux/bitops.h>
+#include <linux/of_device.h>
 
 #include <asm/processor.h>
 #include <asm/sections.h>
@@ -56,7 +57,6 @@
 #include <asm/dma.h>
 #include <asm/cputable.h>
 #include <asm/time.h>
-#include <asm/of_device.h>
 #include <asm/lmb.h>
 #include <asm/mpic.h>
 #include <asm/rtas.h>
-- 
1.5.4.rc0

Re: [PATCH] Use <linux/of_{platform, device}.h> and not <asm/...> variants.

From: Stephen Rothwell <hidden>
Date: 2008-01-08 00:36:47

Hi Jon,

On Mon, 07 Jan 2008 12:07:15 -0600 Jon Loeliger [off-list ref] wrote:
From: Jon Loeliger <redacted>

Signed-off-by: Jon Loeliger <redacted>
---

Paul,

Continue to fight the Good Fight by removing
old include file references that managed to
creep in recently.

These are the last few in arch/powerpc directly.
If you could pick this up for .25, that be good!
Thanks for doing this.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help