diff options
| author | Len Brown <len.brown@intel.com> | 2007-02-16 18:52:41 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-02-16 18:52:41 -0500 |
| commit | 81450b73dde07f473a4a7208b209b4c8b7251d90 (patch) | |
| tree | 94e676c74c32f2a74dc306cf863d7e190777f2ab /include/asm-i386 | |
| parent | 8a03d9a498eaf02c8a118752050a5154852c13bf (diff) | |
| parent | 0539771d7236b425f285652f6f297cc7939c8f9a (diff) | |
| download | kernel_samsung_crespo-81450b73dde07f473a4a7208b209b4c8b7251d90.zip kernel_samsung_crespo-81450b73dde07f473a4a7208b209b4c8b7251d90.tar.gz kernel_samsung_crespo-81450b73dde07f473a4a7208b209b4c8b7251d90.tar.bz2 | |
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.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-i386/acpi.h b/include/asm-i386/acpi.h index 5e657eb..449f3f2 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 */ |