Merge branches 'release' and 'stats' into release

[linux-2.6-omap-h63xx.git] / include / linux / acpi.h

diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index de09704d3dd2e38bd561fbe66f9356c01062809b..cf13bec517b7b9a3d3f18b4d2ed4920a9c17665d 100644 (file)
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -114,7 +114,9 @@ int acpi_unmap_lsapic(int cpu);
 
 int acpi_register_ioapic(acpi_handle handle, u64 phys_addr, u32 gsi_base);
 int acpi_unregister_ioapic(acpi_handle handle, u32 gsi_base);
+void acpi_irq_stats_init(void);
 
+extern u32 acpi_irq_handled;
 extern int acpi_mp_config;
 
 extern struct acpi_mcfg_allocation *pci_mmcfg_config;