Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6] / include / asm-x86 / acpi.h

diff --git a/include/asm-x86/acpi.h b/include/asm-x86/acpi.h
index 98a9ca266531e5c823f125d72f5445f7474d4a5d..7a72d6aa50be85527b904fbbfe815c0701760d77 100644 (file)
--- a/include/asm-x86/acpi.h
+++ b/include/asm-x86/acpi.h
@@ -89,6 +89,10 @@ extern int acpi_pci_disabled;
 extern int acpi_skip_timer_override;
 extern int acpi_use_timer_override;
 
+extern u8 acpi_sci_flags;
+extern int acpi_sci_override_gsi;
+void acpi_pic_sci_set_trigger(unsigned int, u16);
+
 static inline void disable_acpi(void)
 {
        acpi_disabled = 1;