From fc02face27312402658d1d29e8678e8ea750bf7e Mon Sep 17 00:00:00 2001
From: Len Brown <len.brown@intel.com>
Date: Fri, 12 Jun 2009 20:47:50 -0400
Subject: [PATCH] --- yaml --- r: 154174 b: refs/heads/master c:
 ab46feae865c5b96dbf5e261be8638165932bfb1 h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/arch/x86/include/asm/acpi.h | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 782e62c6fabd..f55858c2e594 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4a7a16dc061e4c57bf288150f51bd4c2ace33723
+refs/heads/master: ab46feae865c5b96dbf5e261be8638165932bfb1
diff --git a/trunk/arch/x86/include/asm/acpi.h b/trunk/arch/x86/include/asm/acpi.h
index 4518dc500903..20d1465a2ab0 100644
--- a/trunk/arch/x86/include/asm/acpi.h
+++ b/trunk/arch/x86/include/asm/acpi.h
@@ -144,6 +144,7 @@ static inline unsigned int acpi_processor_cstate_check(unsigned int max_cstate)
 
 #else /* !CONFIG_ACPI */
 
+#define acpi_disabled 1
 #define acpi_lapic 0
 #define acpi_ioapic 0
 static inline void acpi_noirq_set(void) { }