X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=include%2Fasm-sparc%2Febus.h;fp=include%2Fasm-sparc%2Febus.h;h=2d6a997c5b0c926a4cbccfe313465ec391a16f67;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=54652887c127ada490bd1d1aef9a93ebd3f0ceb7;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/include/asm-sparc/ebus.h b/include/asm-sparc/ebus.h
index 54652887c..2d6a997c5 100644
--- 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 <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 device_node		*prom_node;
+	int				 prom_node;
+	char				 prom_name[64];
 	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 of_device		ofdev;
 	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;
 };
-#define to_ebus_device(d) container_of(d, struct linux_ebus_device, ofdev.dev)
 
 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 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;