diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/pci/hotplug/acpiphp.h | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/pci/hotplug/acpiphp.h')
| -rw-r--r-- | drivers/pci/hotplug/acpiphp.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/pci/hotplug/acpiphp.h b/drivers/pci/hotplug/acpiphp.h index 7d938df79206..bab52047baa8 100644 --- a/drivers/pci/hotplug/acpiphp.h +++ b/drivers/pci/hotplug/acpiphp.h | |||
| @@ -146,12 +146,6 @@ struct acpiphp_attention_info | |||
| 146 | struct module *owner; | 146 | struct module *owner; |
| 147 | }; | 147 | }; |
| 148 | 148 | ||
| 149 | struct acpiphp_ioapic { | ||
| 150 | struct pci_dev *dev; | ||
| 151 | u32 gsi_base; | ||
| 152 | struct list_head list; | ||
| 153 | }; | ||
| 154 | |||
| 155 | /* PCI bus bridge HID */ | 149 | /* PCI bus bridge HID */ |
| 156 | #define ACPI_PCI_HOST_HID "PNP0A03" | 150 | #define ACPI_PCI_HOST_HID "PNP0A03" |
| 157 | 151 | ||