diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-27 18:16:47 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-27 18:16:47 -0400 |
| commit | 3b9f6cb8a1ec791be79c6c7595fea922f12d1e64 (patch) | |
| tree | 2393a448add846e6c2ed12f68106c3018b72c6a9 /drivers/pci/hotplug/acpiphp.h | |
| parent | c38778c3a9aeadcd1ee319cfc8ea5a9cbf8cdafa (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/pci/hotplug/acpiphp.h')
| -rw-r--r-- | drivers/pci/hotplug/acpiphp.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/pci/hotplug/acpiphp.h b/drivers/pci/hotplug/acpiphp.h index be104eced34c..7fff07e877c7 100644 --- a/drivers/pci/hotplug/acpiphp.h +++ b/drivers/pci/hotplug/acpiphp.h | |||
| @@ -150,6 +150,11 @@ struct acpiphp_attention_info | |||
| 150 | struct module *owner; | 150 | struct module *owner; |
| 151 | }; | 151 | }; |
| 152 | 152 | ||
| 153 | struct acpiphp_ioapic { | ||
| 154 | struct pci_dev *dev; | ||
| 155 | u32 gsi_base; | ||
| 156 | struct list_head list; | ||
| 157 | }; | ||
| 153 | 158 | ||
| 154 | /* PCI bus bridge HID */ | 159 | /* PCI bus bridge HID */ |
| 155 | #define ACPI_PCI_HOST_HID "PNP0A03" | 160 | #define ACPI_PCI_HOST_HID "PNP0A03" |