Merge with Linux 2.3.99-pre2.

1 files changed, 21 insertions, 3 deletions

diff --git a/arch/arm/kernel/bios32.h b/arch/arm/kernel/bios32.h
index 9a4380732..525af165b 100644
--- a/arch/arm/kernel/bios32.h
+++ b/arch/arm/kernel/bios32.h
@@ -1,9 +1,27 @@
+#define MAX_NR_BUS	2
+
+struct arm_bus_sysdata {
+	/*
+	 * bitmask of features we can turn.
+	 * See PCI command register for more info.
+	 */
+	u16		features;
+	/*
+	 * Maximum devsel for this bus.
+	 */
+	u16		maxdevsel;
+};
+
+struct arm_pci_sysdata {
+	struct arm_bus_sysdata bus[MAX_NR_BUS];
+};
+
 struct hw_pci {
-	void (*init)(void);
+	void		(*init)(void);
 	unsigned long	io_start;
 	unsigned long	mem_start;
-	u8   (*swizzle)(struct pci_dev *dev, u8 *pin);
-	int  (*map_irq)(struct pci_dev *dev, u8 slot, u8 pin);
+	u8		(*swizzle)(struct pci_dev *dev, u8 *pin);
+	int		(*map_irq)(struct pci_dev *dev, u8 slot, u8 pin);
 };
 
 void __init dc21285_init(void);