diff options
| author | Len Brown <len.brown@intel.com> | 2008-02-07 03:13:36 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-02-07 03:13:36 -0500 |
| commit | e5e54bc86a1fed9849b22fd736c30b23c4719046 (patch) | |
| tree | c53d0d5a7d6e2806bc154f8fc1642ec7a6684ca1 /include/linux/acpi.h | |
| parent | 70ec75c5b8e0bda7a16fb387f91e08545f379a0e (diff) | |
| parent | 5229e87d59cef33539322948bd8e3b5a537f7c97 (diff) | |
Merge branches 'release' and 'stats' into release
Diffstat (limited to 'include/linux/acpi.h')
| -rw-r--r-- | include/linux/acpi.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index de09704d3dd2..cf13bec517b7 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h | |||
| @@ -114,7 +114,9 @@ int acpi_unmap_lsapic(int cpu); | |||
| 114 | 114 | ||
| 115 | int acpi_register_ioapic(acpi_handle handle, u64 phys_addr, u32 gsi_base); | 115 | int acpi_register_ioapic(acpi_handle handle, u64 phys_addr, u32 gsi_base); |
| 116 | int acpi_unregister_ioapic(acpi_handle handle, u32 gsi_base); | 116 | int acpi_unregister_ioapic(acpi_handle handle, u32 gsi_base); |
| 117 | void acpi_irq_stats_init(void); | ||
| 117 | 118 | ||
| 119 | extern u32 acpi_irq_handled; | ||
| 118 | extern int acpi_mp_config; | 120 | extern int acpi_mp_config; |
| 119 | 121 | ||
| 120 | extern struct acpi_mcfg_allocation *pci_mmcfg_config; | 122 | extern struct acpi_mcfg_allocation *pci_mmcfg_config; |