diff --git a/[refs] b/[refs]
index 6087c069ca9d..832caa51ab10 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 615d5f235b6c402ca01098a828c3d67e79e57cb6
+refs/heads/master: a795ca5852fb944f21bd71c1230fcc5456e7d5ef
diff --git a/trunk/include/asm-i386/acpi.h b/trunk/include/asm-i386/acpi.h
index 5e657eb8946c..449f3f272e07 100644
--- a/trunk/include/asm-i386/acpi.h
+++ b/trunk/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 */