aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-sparc/ebus.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@sunset.davemloft.net>2006-06-23 18:53:31 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2006-06-24 02:15:45 -0400
commit942a6bdd1c4d2419a42be77ba1c964e4ba8dae9e (patch)
treeb1a432a83aff7b88d301d4932ff75e5078b8c347 /include/asm-sparc/ebus.h
parenta2bd4fd17926d715a470fbe0ebe05128ba410984 (diff)
[SPARC]: Port sparc64 in-kernel device tree code to sparc32.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/asm-sparc/ebus.h')
-rw-r--r--include/asm-sparc/ebus.h12
1 files changed, 4 insertions, 8 deletions
diff --git a/include/asm-sparc/ebus.h b/include/asm-sparc/ebus.h
index 2d6a997c5b0c..0dc3c01b4b1f 100644
--- a/include/asm-sparc/ebus.h
+++ b/include/asm-sparc/ebus.h
@@ -13,13 +13,13 @@
13#include <linux/ioport.h> 13#include <linux/ioport.h>
14#endif 14#endif
15#include <asm/oplib.h> 15#include <asm/oplib.h>
16#include <asm/prom.h>
16 17
17struct linux_ebus_child { 18struct linux_ebus_child {
18 struct linux_ebus_child *next; 19 struct linux_ebus_child *next;
19 struct linux_ebus_device *parent; 20 struct linux_ebus_device *parent;
20 struct linux_ebus *bus; 21 struct linux_ebus *bus;
21 int prom_node; 22 struct device_node *prom_node;
22 char prom_name[64];
23 struct resource resource[PROMREG_MAX]; 23 struct resource resource[PROMREG_MAX];
24 int num_addrs; 24 int num_addrs;
25 unsigned int irqs[PROMINTR_MAX]; 25 unsigned int irqs[PROMINTR_MAX];
@@ -30,8 +30,7 @@ struct linux_ebus_device {
30 struct linux_ebus_device *next; 30 struct linux_ebus_device *next;
31 struct linux_ebus_child *children; 31 struct linux_ebus_child *children;
32 struct linux_ebus *bus; 32 struct linux_ebus *bus;
33 int prom_node; 33 struct device_node *prom_node;
34 char prom_name[64];
35 struct resource resource[PROMREG_MAX]; 34 struct resource resource[PROMREG_MAX];
36 int num_addrs; 35 int num_addrs;
37 unsigned int irqs[PROMINTR_MAX]; 36 unsigned int irqs[PROMINTR_MAX];
@@ -43,10 +42,7 @@ struct linux_ebus {
43 struct linux_ebus_device *devices; 42 struct linux_ebus_device *devices;
44 struct linux_pbm_info *parent; 43 struct linux_pbm_info *parent;
45 struct pci_dev *self; 44 struct pci_dev *self;
46 int prom_node; 45 struct device_node *prom_node;
47 char prom_name[64];
48 struct linux_prom_ebus_ranges ebus_ranges[PROMREG_MAX];
49 int num_ebus_ranges;
50}; 46};
51 47
52struct linux_ebus_dma { 48struct linux_ebus_dma {