aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sparc64
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2008-08-07 18:33:36 -0400
committerDavid S. Miller <davem@davemloft.net>2008-08-07 18:33:36 -0400
commit764f2579d95120e1c76b7af1256d02466ddd00bf (patch)
tree312f1d759d18ff3e8176b06c1f1468baa3ca953c /arch/sparc64
parentea771bd51c3b9b9683860515d93e6155a345fa2f (diff)
sparc: don't use asm/of_device.h
Use linux/of_device.h instead. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc64')
-rw-r--r--arch/sparc64/kernel/auxio.c2
-rw-r--r--arch/sparc64/kernel/ebus.c2
-rw-r--r--arch/sparc64/kernel/pci_common.c2
-rw-r--r--arch/sparc64/kernel/pci_psycho.c2
-rw-r--r--arch/sparc64/kernel/pci_sabre.c2
-rw-r--r--arch/sparc64/kernel/pci_schizo.c2
-rw-r--r--arch/sparc64/kernel/power.c2
-rw-r--r--arch/sparc64/kernel/prom.c2
-rw-r--r--arch/sparc64/kernel/time.c2
9 files changed, 9 insertions, 9 deletions
diff --git a/arch/sparc64/kernel/auxio.c b/arch/sparc64/kernel/auxio.c
index c55f0293eacd..dd5c7bf87619 100644
--- a/arch/sparc64/kernel/auxio.c
+++ b/arch/sparc64/kernel/auxio.c
@@ -9,9 +9,9 @@
9#include <linux/kernel.h> 9#include <linux/kernel.h>
10#include <linux/init.h> 10#include <linux/init.h>
11#include <linux/ioport.h> 11#include <linux/ioport.h>
12#include <linux/of_device.h>
12 13
13#include <asm/prom.h> 14#include <asm/prom.h>
14#include <asm/of_device.h>
15#include <asm/io.h> 15#include <asm/io.h>
16#include <asm/auxio.h> 16#include <asm/auxio.h>
17 17
diff --git a/arch/sparc64/kernel/ebus.c b/arch/sparc64/kernel/ebus.c
index 4d58d7ce708d..60d36d142559 100644
--- a/arch/sparc64/kernel/ebus.c
+++ b/arch/sparc64/kernel/ebus.c
@@ -14,13 +14,13 @@
14#include <linux/interrupt.h> 14#include <linux/interrupt.h>
15#include <linux/delay.h> 15#include <linux/delay.h>
16#include <linux/pci.h> 16#include <linux/pci.h>
17#include <linux/of_device.h>
17 18
18#include <asm/system.h> 19#include <asm/system.h>
19#include <asm/page.h> 20#include <asm/page.h>
20#include <asm/ebus.h> 21#include <asm/ebus.h>
21#include <asm/oplib.h> 22#include <asm/oplib.h>
22#include <asm/prom.h> 23#include <asm/prom.h>
23#include <asm/of_device.h>
24#include <asm/bpp.h> 24#include <asm/bpp.h>
25#include <asm/irq.h> 25#include <asm/irq.h>
26#include <asm/io.h> 26#include <asm/io.h>
diff --git a/arch/sparc64/kernel/pci_common.c b/arch/sparc64/kernel/pci_common.c
index 19fa621d6a60..09a5ec200c61 100644
--- a/arch/sparc64/kernel/pci_common.c
+++ b/arch/sparc64/kernel/pci_common.c
@@ -8,9 +8,9 @@
8#include <linux/init.h> 8#include <linux/init.h>
9#include <linux/pci.h> 9#include <linux/pci.h>
10#include <linux/device.h> 10#include <linux/device.h>
11#include <linux/of_device.h>
11 12
12#include <asm/prom.h> 13#include <asm/prom.h>
13#include <asm/of_device.h>
14#include <asm/oplib.h> 14#include <asm/oplib.h>
15 15
16#include "pci_impl.h" 16#include "pci_impl.h"
diff --git a/arch/sparc64/kernel/pci_psycho.c b/arch/sparc64/kernel/pci_psycho.c
index 994dbe0603da..ef5fe29202c2 100644
--- a/arch/sparc64/kernel/pci_psycho.c
+++ b/arch/sparc64/kernel/pci_psycho.c
@@ -11,12 +11,12 @@
11#include <linux/init.h> 11#include <linux/init.h>
12#include <linux/slab.h> 12#include <linux/slab.h>
13#include <linux/interrupt.h> 13#include <linux/interrupt.h>
14#include <linux/of_device.h>
14 15
15#include <asm/iommu.h> 16#include <asm/iommu.h>
16#include <asm/irq.h> 17#include <asm/irq.h>
17#include <asm/starfire.h> 18#include <asm/starfire.h>
18#include <asm/prom.h> 19#include <asm/prom.h>
19#include <asm/of_device.h>
20#include <asm/oplib.h> 20#include <asm/oplib.h>
21 21
22#include "pci_impl.h" 22#include "pci_impl.h"
diff --git a/arch/sparc64/kernel/pci_sabre.c b/arch/sparc64/kernel/pci_sabre.c
index 4c34195baf37..ade5184e75d1 100644
--- a/arch/sparc64/kernel/pci_sabre.c
+++ b/arch/sparc64/kernel/pci_sabre.c
@@ -11,6 +11,7 @@
11#include <linux/init.h> 11#include <linux/init.h>
12#include <linux/slab.h> 12#include <linux/slab.h>
13#include <linux/interrupt.h> 13#include <linux/interrupt.h>
14#include <linux/of_device.h>
14 15
15#include <asm/apb.h> 16#include <asm/apb.h>
16#include <asm/iommu.h> 17#include <asm/iommu.h>
@@ -18,7 +19,6 @@
18#include <asm/smp.h> 19#include <asm/smp.h>
19#include <asm/oplib.h> 20#include <asm/oplib.h>
20#include <asm/prom.h> 21#include <asm/prom.h>
21#include <asm/of_device.h>
22 22
23#include "pci_impl.h" 23#include "pci_impl.h"
24#include "iommu_common.h" 24#include "iommu_common.h"
diff --git a/arch/sparc64/kernel/pci_schizo.c b/arch/sparc64/kernel/pci_schizo.c
index 615edd9c8e2a..9248c6737f0e 100644
--- a/arch/sparc64/kernel/pci_schizo.c
+++ b/arch/sparc64/kernel/pci_schizo.c
@@ -9,13 +9,13 @@
9#include <linux/init.h> 9#include <linux/init.h>
10#include <linux/slab.h> 10#include <linux/slab.h>
11#include <linux/interrupt.h> 11#include <linux/interrupt.h>
12#include <linux/of_device.h>
12 13
13#include <asm/iommu.h> 14#include <asm/iommu.h>
14#include <asm/irq.h> 15#include <asm/irq.h>
15#include <asm/upa.h> 16#include <asm/upa.h>
16#include <asm/pstate.h> 17#include <asm/pstate.h>
17#include <asm/prom.h> 18#include <asm/prom.h>
18#include <asm/of_device.h>
19#include <asm/oplib.h> 19#include <asm/oplib.h>
20 20
21#include "pci_impl.h" 21#include "pci_impl.h"
diff --git a/arch/sparc64/kernel/power.c b/arch/sparc64/kernel/power.c
index eae8ca2a6ba5..3bb987a6d03c 100644
--- a/arch/sparc64/kernel/power.c
+++ b/arch/sparc64/kernel/power.c
@@ -13,11 +13,11 @@
13#include <linux/pm.h> 13#include <linux/pm.h>
14#include <linux/syscalls.h> 14#include <linux/syscalls.h>
15#include <linux/reboot.h> 15#include <linux/reboot.h>
16#include <linux/of_device.h>
16 17
17#include <asm/system.h> 18#include <asm/system.h>
18#include <asm/auxio.h> 19#include <asm/auxio.h>
19#include <asm/prom.h> 20#include <asm/prom.h>
20#include <asm/of_device.h>
21#include <asm/io.h> 21#include <asm/io.h>
22#include <asm/sstate.h> 22#include <asm/sstate.h>
23#include <asm/reboot.h> 23#include <asm/reboot.h>
diff --git a/arch/sparc64/kernel/prom.c b/arch/sparc64/kernel/prom.c
index ed03a18d3b36..3c048ac4e638 100644
--- a/arch/sparc64/kernel/prom.c
+++ b/arch/sparc64/kernel/prom.c
@@ -21,9 +21,9 @@
21#include <linux/mm.h> 21#include <linux/mm.h>
22#include <linux/module.h> 22#include <linux/module.h>
23#include <linux/lmb.h> 23#include <linux/lmb.h>
24#include <linux/of_device.h>
24 25
25#include <asm/prom.h> 26#include <asm/prom.h>
26#include <asm/of_device.h>
27#include <asm/oplib.h> 27#include <asm/oplib.h>
28#include <asm/irq.h> 28#include <asm/irq.h>
29#include <asm/asi.h> 29#include <asm/asi.h>
diff --git a/arch/sparc64/kernel/time.c b/arch/sparc64/kernel/time.c
index a0c6a97eec6e..cc16fdcf98af 100644
--- a/arch/sparc64/kernel/time.c
+++ b/arch/sparc64/kernel/time.c
@@ -33,6 +33,7 @@
33#include <linux/kernel_stat.h> 33#include <linux/kernel_stat.h>
34#include <linux/clockchips.h> 34#include <linux/clockchips.h>
35#include <linux/clocksource.h> 35#include <linux/clocksource.h>
36#include <linux/of_device.h>
36 37
37#include <asm/oplib.h> 38#include <asm/oplib.h>
38#include <asm/mostek.h> 39#include <asm/mostek.h>
@@ -40,7 +41,6 @@
40#include <asm/irq.h> 41#include <asm/irq.h>
41#include <asm/io.h> 42#include <asm/io.h>
42#include <asm/prom.h> 43#include <asm/prom.h>
43#include <asm/of_device.h>
44#include <asm/starfire.h> 44#include <asm/starfire.h>
45#include <asm/smp.h> 45#include <asm/smp.h>
46#include <asm/sections.h> 46#include <asm/sections.h>