summaryrefslogtreecommitdiff
path: root/include/asm-sparc64/isa.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@sunset.davemloft.net>2006-06-22 19:12:03 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2006-06-23 23:15:28 -0700
commit690c8fd31f1e35985d0f35772fde514da59ec9d1 (patch)
tree8a5a0036b3780a9eb315ea2201a2562570de1ebe /include/asm-sparc64/isa.h
parentde8d28b16f5614aeb12bb69c8f9a38578b8d3ada (diff)
downloadlwn-690c8fd31f1e35985d0f35772fde514da59ec9d1.tar.gz
lwn-690c8fd31f1e35985d0f35772fde514da59ec9d1.zip
[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 @@
#include <asm/pbm.h>
#include <asm/oplib.h>
+#include <asm/prom.h>
struct sparc_isa_bridge;
@@ -16,9 +17,7 @@ struct sparc_isa_device {
struct sparc_isa_device *next;
struct sparc_isa_device *child;
struct sparc_isa_bridge *bus;
- int prom_node;
- char prom_name[64];
- char compatible[64];
+ struct device_node *prom_node;
struct resource resource;
unsigned int irq;
};
@@ -29,8 +28,7 @@ struct sparc_isa_bridge {
struct pci_pbm_info *parent;
struct pci_dev *self;
int index;
- int prom_node;
- char prom_name[64];
+ struct device_node *prom_node;
#define linux_prom_isa_ranges linux_prom_ebus_ranges
struct linux_prom_isa_ranges isa_ranges[PROMREG_MAX];
int num_isa_ranges;