aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-sparc64/isa.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/isa.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/isa.h')
-rw-r--r--include/asm-sparc64/isa.h8
1 files changed, 3 insertions, 5 deletions
diff --git a/include/asm-sparc64/isa.h b/include/asm-sparc64/isa.h
index 4601bbfc3e7b..e110435b14ef 100644
--- a/include/asm-sparc64/isa.h
+++ b/include/asm-sparc64/isa.h
@@ -9,6 +9,7 @@
9 9
10#include <asm/pbm.h> 10#include <asm/pbm.h>
11#include <asm/oplib.h> 11#include <asm/oplib.h>
12#include <asm/prom.h>
12 13
13struct sparc_isa_bridge; 14struct sparc_isa_bridge;
14 15
@@ -16,9 +17,7 @@ struct sparc_isa_device {
16 struct sparc_isa_device *next; 17 struct sparc_isa_device *next;
17 struct sparc_isa_device *child; 18 struct sparc_isa_device *child;
18 struct sparc_isa_bridge *bus; 19 struct sparc_isa_bridge *bus;
19 int prom_node; 20 struct device_node *prom_node;
20 char prom_name[64];
21 char compatible[64];
22 struct resource resource; 21 struct resource resource;
23 unsigned int irq; 22 unsigned int irq;
24}; 23};
@@ -29,8 +28,7 @@ struct sparc_isa_bridge {
29 struct pci_pbm_info *parent; 28 struct pci_pbm_info *parent;
30 struct pci_dev *self; 29 struct pci_dev *self;
31 int index; 30 int index;
32 int prom_node; 31 struct device_node *prom_node;
33 char prom_name[64];
34#define linux_prom_isa_ranges linux_prom_ebus_ranges 32#define linux_prom_isa_ranges linux_prom_ebus_ranges
35 struct linux_prom_isa_ranges isa_ranges[PROMREG_MAX]; 33 struct linux_prom_isa_ranges isa_ranges[PROMREG_MAX];
36 int num_isa_ranges; 34 int num_isa_ranges;