Merge branch 'asus' into release

[mv-sheeva.git] / drivers / pci / hotplug / acpiphp.h

diff --git a/drivers/pci/hotplug/acpiphp.h b/drivers/pci/hotplug/acpiphp.h
index e68d5f20ffb3fb8198560dfb414fe126ecbeda6d..bab52047baa84101d2448a06b617381b21918444 100644 (file)
--- a/drivers/pci/hotplug/acpiphp.h
+++ b/drivers/pci/hotplug/acpiphp.h
@@ -91,9 +91,6 @@ struct acpiphp_bridge {
        /* PCI-to-PCI bridge device */
        struct pci_dev *pci_dev;
 
-       /* ACPI 2.0 _HPP parameters */
-       struct hotplug_params hpp;
-
        spinlock_t res_lock;
 };
 
@@ -149,12 +146,6 @@ struct acpiphp_attention_info
        struct module *owner;
 };
 
-struct acpiphp_ioapic {
-       struct pci_dev *dev;
-       u32 gsi_base;
-       struct list_head list;
-};
-
 /* PCI bus bridge HID */
 #define ACPI_PCI_HOST_HID              "PNP0A03"