Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

[karo-tx-linux.git] / drivers / pci / hotplug / shpchp.h

diff --git a/drivers/pci/hotplug/shpchp.h b/drivers/pci/hotplug/shpchp.h
index 08ad26a0cae70c2d209e6a30af0408758a4c9eed..ce0e9b6ce83378fa416e9f6ed46a7562a0c64689 100644 (file)
--- a/drivers/pci/hotplug/shpchp.h
+++ b/drivers/pci/hotplug/shpchp.h
@@ -98,6 +98,10 @@ struct controller {
        enum pci_bus_speed speed;
        u32 first_slot;         /* First physical slot number */
        u8 slot_bus;            /* Bus where the slots handled by this controller sit */
+       u32 cap_offset;
+       unsigned long mmio_base;
+       unsigned long mmio_size;
+       volatile int cmd_busy;
 };
 
 struct hotplug_params {