diff options
Diffstat (limited to 'arch/sparc/include/asm')
-rw-r--r-- | arch/sparc/include/asm/device.h | 4 | ||||
-rw-r--r-- | arch/sparc/include/asm/of_device.h | 14 |
2 files changed, 2 insertions, 16 deletions
diff --git a/arch/sparc/include/asm/device.h b/arch/sparc/include/asm/device.h index f9740d065fe7..fb220e482039 100644 --- a/arch/sparc/include/asm/device.h +++ b/arch/sparc/include/asm/device.h | |||
@@ -9,13 +9,13 @@ | |||
9 | #include <asm/openprom.h> | 9 | #include <asm/openprom.h> |
10 | 10 | ||
11 | struct device_node; | 11 | struct device_node; |
12 | struct of_device; | 12 | struct platform_device; |
13 | 13 | ||
14 | struct dev_archdata { | 14 | struct dev_archdata { |
15 | void *iommu; | 15 | void *iommu; |
16 | void *stc; | 16 | void *stc; |
17 | void *host_controller; | 17 | void *host_controller; |
18 | struct of_device *op; | 18 | struct platform_device *op; |
19 | int numa_node; | 19 | int numa_node; |
20 | }; | 20 | }; |
21 | 21 | ||
diff --git a/arch/sparc/include/asm/of_device.h b/arch/sparc/include/asm/of_device.h index 6d1844a547b4..22b9828fe693 100644 --- a/arch/sparc/include/asm/of_device.h +++ b/arch/sparc/include/asm/of_device.h | |||
@@ -7,20 +7,6 @@ | |||
7 | #include <linux/mod_devicetable.h> | 7 | #include <linux/mod_devicetable.h> |
8 | #include <asm/openprom.h> | 8 | #include <asm/openprom.h> |
9 | 9 | ||
10 | /* | ||
11 | * The of_device is a kind of "base class" that is a superset of | ||
12 | * struct device for use by devices attached to an OF node and | ||
13 | * probed using OF properties. | ||
14 | */ | ||
15 | struct of_device | ||
16 | { | ||
17 | struct device dev; | ||
18 | u32 num_resources; | ||
19 | struct resource *resource; | ||
20 | |||
21 | struct pdev_archdata archdata; | ||
22 | }; | ||
23 | |||
24 | extern void __iomem *of_ioremap(struct resource *res, unsigned long offset, unsigned long size, char *name); | 10 | extern void __iomem *of_ioremap(struct resource *res, unsigned long offset, unsigned long size, char *name); |
25 | extern void of_iounmap(struct resource *res, void __iomem *base, unsigned long size); | 11 | extern void of_iounmap(struct resource *res, void __iomem *base, unsigned long size); |
26 | 12 | ||