aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-sparc64/ebus.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@sunset.davemloft.net>2006-06-22 22:12:03 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2006-06-24 02:15:28 -0400
commit690c8fd31f1e35985d0f35772fde514da59ec9d1 (patch)
tree8a5a0036b3780a9eb315ea2201a2562570de1ebe /include/asm-sparc64/ebus.h
parentde8d28b16f5614aeb12bb69c8f9a38578b8d3ada (diff)
[SPARC64]: Use in-kernel PROM tree for EBUS and ISA.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/asm-sparc64/ebus.h')
-rw-r--r--include/asm-sparc64/ebus.h10
1 files changed, 4 insertions, 6 deletions
diff --git a/include/asm-sparc64/ebus.h b/include/asm-sparc64/ebus.h
index 7a408a030f52..876912f4d83b 100644
--- a/include/asm-sparc64/ebus.h
+++ b/include/asm-sparc64/ebus.h
@@ -10,13 +10,13 @@
10 10
11#include <asm/pbm.h> 11#include <asm/pbm.h>
12#include <asm/oplib.h> 12#include <asm/oplib.h>
13#include <asm/prom.h>
13 14
14struct linux_ebus_child { 15struct linux_ebus_child {
15 struct linux_ebus_child *next; 16 struct linux_ebus_child *next;
16 struct linux_ebus_device *parent; 17 struct linux_ebus_device *parent;
17 struct linux_ebus *bus; 18 struct linux_ebus *bus;
18 int prom_node; 19 struct device_node *prom_node;
19 char prom_name[64];
20 struct resource resource[PROMREG_MAX]; 20 struct resource resource[PROMREG_MAX];
21 int num_addrs; 21 int num_addrs;
22 unsigned int irqs[PROMINTR_MAX]; 22 unsigned int irqs[PROMINTR_MAX];
@@ -27,8 +27,7 @@ struct linux_ebus_device {
27 struct linux_ebus_device *next; 27 struct linux_ebus_device *next;
28 struct linux_ebus_child *children; 28 struct linux_ebus_child *children;
29 struct linux_ebus *bus; 29 struct linux_ebus *bus;
30 int prom_node; 30 struct device_node *prom_node;
31 char prom_name[64];
32 struct resource resource[PROMREG_MAX]; 31 struct resource resource[PROMREG_MAX];
33 int num_addrs; 32 int num_addrs;
34 unsigned int irqs[PROMINTR_MAX]; 33 unsigned int irqs[PROMINTR_MAX];
@@ -42,8 +41,7 @@ struct linux_ebus {
42 struct pci_dev *self; 41 struct pci_dev *self;
43 int index; 42 int index;
44 int is_rio; 43 int is_rio;
45 int prom_node; 44 struct device_node *prom_node;
46 char prom_name[64];
47 struct linux_prom_ebus_ranges ebus_ranges[PROMREG_MAX]; 45 struct linux_prom_ebus_ranges ebus_ranges[PROMREG_MAX];
48 int num_ebus_ranges; 46 int num_ebus_ranges;
49 struct linux_prom_ebus_intmap ebus_intmap[PROMREG_MAX]; 47 struct linux_prom_ebus_intmap ebus_intmap[PROMREG_MAX];