aboutsummaryrefslogtreecommitdiff
path: root/include/asm-i386
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2007-02-16 18:52:41 -0500
committerLen Brown <len.brown@intel.com>2007-02-16 18:52:41 -0500
commit81450b73dde07f473a4a7208b209b4c8b7251d90 (patch)
tree94e676c74c32f2a74dc306cf863d7e190777f2ab /include/asm-i386
parent8a03d9a498eaf02c8a118752050a5154852c13bf (diff)
parent0539771d7236b425f285652f6f297cc7939c8f9a (diff)
Pull misc-for-upstream into release branch
Conflicts: drivers/usb/misc/appledisplay.c Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'include/asm-i386')
-rw-r--r--include/asm-i386/acpi.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-i386/acpi.h b/include/asm-i386/acpi.h
index 5e657eb8946..449f3f272e0 100644
--- a/include/asm-i386/acpi.h
+++ b/include/asm-i386/acpi.h
@@ -127,6 +127,7 @@ extern int acpi_irq_balance_set(char *str);
#define acpi_ioapic 0
static inline void acpi_noirq_set(void) { }
static inline void acpi_disable_pci(void) { }
+static inline void disable_acpi(void) { }
#endif /* !CONFIG_ACPI */