diff options
| author |   Stephen Rothwell <sfr@canb.auug.org.au> | 2008-08-07 15:33:36 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2008-08-07 15:33:36 -0700 |
| commit | 764f2579d95120e1c76b7af1256d02466ddd00bf (patch) | |
| tree | 312f1d759d18ff3e8176b06c1f1468baa3ca953c /arch/sparc/include | |
| parent | sparc64: Use kernel/uid16.c helpers instead of own copy. (diff) | |
| download | linux-dev-764f2579d95120e1c76b7af1256d02466ddd00bf.tar.xz linux-dev-764f2579d95120e1c76b7af1256d02466ddd00bf.zip | |
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/sparc/include')
| -rw-r--r-- | arch/sparc/include/asm/ebus_32.h | 2 | ||||
| -rw-r--r-- | arch/sparc/include/asm/ebus_64.h | 3 | ||||
| -rw-r--r-- | arch/sparc/include/asm/parport.h | 3 | ||||
| -rw-r--r-- | arch/sparc/include/asm/sbus_32.h | 2 | ||||
| -rw-r--r-- | arch/sparc/include/asm/sbus_64.h | 2 |
5 files changed, 7 insertions, 5 deletions
diff --git a/arch/sparc/include/asm/ebus_32.h b/arch/sparc/include/asm/ebus_32.h index 29cb7dfc6b79..f91f0b267ce1 100644 --- a/arch/sparc/include/asm/ebus_32.h +++ b/arch/sparc/include/asm/ebus_32.h @@ -12,9 +12,9 @@ #ifndef _LINUX_IOPORT_H #include <linux/ioport.h> #endif +#include <linux/of_device.h> #include <asm/oplib.h> #include <asm/prom.h> -#include <asm/of_device.h> struct linux_ebus_child { struct linux_ebus_child *next; diff --git a/arch/sparc/include/asm/ebus_64.h b/arch/sparc/include/asm/ebus_64.h index fcc62b97ced5..14c6a111f60c 100644 --- a/arch/sparc/include/asm/ebus_64.h +++ b/arch/sparc/include/asm/ebus_64.h @@ -8,9 +8,10 @@ #ifndef __SPARC64_EBUS_H #define __SPARC64_EBUS_H +#include <linux/of_device.h> + #include <asm/oplib.h> #include <asm/prom.h> -#include <asm/of_device.h> struct linux_ebus_child { struct linux_ebus_child *next; diff --git a/arch/sparc/include/asm/parport.h b/arch/sparc/include/asm/parport.h index 7818b2523b8d..d9830621c906 100644 --- a/arch/sparc/include/asm/parport.h +++ b/arch/sparc/include/asm/parport.h @@ -6,9 +6,10 @@ #ifndef _ASM_SPARC64_PARPORT_H #define _ASM_SPARC64_PARPORT_H 1 +#include <linux/of_device.h> + #include <asm/ebus.h> #include <asm/ns87303.h> -#include <asm/of_device.h> #include <asm/prom.h> #define PARPORT_PC_MAX_PORTS PARPORT_MAX diff --git a/arch/sparc/include/asm/sbus_32.h b/arch/sparc/include/asm/sbus_32.h index 77b5d3aadc99..a7b4fa21931d 100644 --- a/arch/sparc/include/asm/sbus_32.h +++ b/arch/sparc/include/asm/sbus_32.h @@ -9,10 +9,10 @@ #include <linux/dma-mapping.h> #include <linux/ioport.h> +#include <linux/of_device.h> #include <asm/oplib.h> #include <asm/prom.h> -#include <asm/of_device.h> #include <asm/scatterlist.h> /* We scan which devices are on the SBus using the PROM node device diff --git a/arch/sparc/include/asm/sbus_64.h b/arch/sparc/include/asm/sbus_64.h index 0e16b6dd7e96..b606c14343fb 100644 --- a/arch/sparc/include/asm/sbus_64.h +++ b/arch/sparc/include/asm/sbus_64.h @@ -8,10 +8,10 @@ #include <linux/dma-mapping.h> #include <linux/ioport.h> +#include <linux/of_device.h> #include <asm/oplib.h> #include <asm/prom.h> -#include <asm/of_device.h> #include <asm/iommu.h> #include <asm/scatterlist.h> |