git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
include
/
asm-sparc
/
ebus.h
diff --git
a/include/asm-sparc/ebus.h
b/include/asm-sparc/ebus.h
index
5465288
..
2d6a997
100644
(file)
--- a/
include/asm-sparc/ebus.h
+++ b/
include/asm-sparc/ebus.h
@@
-13,14
+13,13
@@
#include <linux/ioport.h>
#endif
#include <asm/oplib.h>
#include <linux/ioport.h>
#endif
#include <asm/oplib.h>
-#include <asm/prom.h>
-#include <asm/of_device.h>
struct linux_ebus_child {
struct linux_ebus_child *next;
struct linux_ebus_device *parent;
struct linux_ebus *bus;
struct linux_ebus_child {
struct linux_ebus_child *next;
struct linux_ebus_device *parent;
struct linux_ebus *bus;
- struct device_node *prom_node;
+ int prom_node;
+ char prom_name[64];
struct resource resource[PROMREG_MAX];
int num_addrs;
unsigned int irqs[PROMINTR_MAX];
struct resource resource[PROMREG_MAX];
int num_addrs;
unsigned int irqs[PROMINTR_MAX];
@@
-28,27
+27,27
@@
struct linux_ebus_child {
};
struct linux_ebus_device {
};
struct linux_ebus_device {
- struct of_device ofdev;
struct linux_ebus_device *next;
struct linux_ebus_child *children;
struct linux_ebus *bus;
struct linux_ebus_device *next;
struct linux_ebus_child *children;
struct linux_ebus *bus;
- struct device_node *prom_node;
+ int prom_node;
+ char prom_name[64];
struct resource resource[PROMREG_MAX];
int num_addrs;
unsigned int irqs[PROMINTR_MAX];
int num_irqs;
};
struct resource resource[PROMREG_MAX];
int num_addrs;
unsigned int irqs[PROMINTR_MAX];
int num_irqs;
};
-#define to_ebus_device(d) container_of(d, struct linux_ebus_device, ofdev.dev)
struct linux_ebus {
struct linux_ebus {
- struct of_device ofdev;
struct linux_ebus *next;
struct linux_ebus_device *devices;
struct linux_pbm_info *parent;
struct pci_dev *self;
struct linux_ebus *next;
struct linux_ebus_device *devices;
struct linux_pbm_info *parent;
struct pci_dev *self;
- struct device_node *prom_node;
+ int prom_node;
+ char prom_name[64];
+ struct linux_prom_ebus_ranges ebus_ranges[PROMREG_MAX];
+ int num_ebus_ranges;
};
};
-#define to_ebus(d) container_of(d, struct linux_ebus, ofdev.dev)
struct linux_ebus_dma {
unsigned int dcsr;
struct linux_ebus_dma {
unsigned int dcsr;