diff options
| author | Len Brown <len.brown@intel.com> | 2009-04-24 01:34:59 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-04-24 01:34:59 -0400 |
| commit | 6e6c348fb23122c6faf89ef10f1b9f034dba0da5 (patch) | |
| tree | a9896fb7efb66f2fd9f632b09805ea1e8dc3b086 /include | |
| parent | 7f3745ad7aca48b946136e3173861821fa8b24c5 (diff) | |
| parent | 88bea188b85f9cefefbbd56b8a48d0f798409177 (diff) | |
Merge branch 'irq' into release
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/acpi.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 6586cbd0d4af..88be890ee3c7 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h | |||
| @@ -111,6 +111,7 @@ int acpi_register_ioapic(acpi_handle handle, u64 phys_addr, u32 gsi_base); | |||
| 111 | int acpi_unregister_ioapic(acpi_handle handle, u32 gsi_base); | 111 | int acpi_unregister_ioapic(acpi_handle handle, u32 gsi_base); |
| 112 | void acpi_irq_stats_init(void); | 112 | void acpi_irq_stats_init(void); |
| 113 | extern u32 acpi_irq_handled; | 113 | extern u32 acpi_irq_handled; |
| 114 | extern u32 acpi_irq_not_handled; | ||
| 114 | 115 | ||
| 115 | extern struct acpi_mcfg_allocation *pci_mmcfg_config; | 116 | extern struct acpi_mcfg_allocation *pci_mmcfg_config; |
| 116 | extern int pci_mmcfg_config_num; | 117 | extern int pci_mmcfg_config_num; |