diff options
author | Len Brown <len.brown@intel.com> | 2009-09-19 00:37:13 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2009-09-19 00:37:13 -0400 |
commit | 003d6a38ce1a59e0053a02fd9e9a65b588bc8e33 (patch) | |
tree | c9b941f4798a2accca200b0b01c07353ce5b07e1 /arch/x86/include | |
parent | 71fd68e7d234f6b7d8407c8f486764d24f8411f4 (diff) | |
parent | e55a5999ffcf72dc4d43d73618957964cb87065a (diff) | |
download | op-kernel-dev-003d6a38ce1a59e0053a02fd9e9a65b588bc8e33.zip op-kernel-dev-003d6a38ce1a59e0053a02fd9e9a65b588bc8e33.tar.gz |
Merge branch 'sfi-base' into release
Conflicts:
drivers/acpi/power.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'arch/x86/include')
-rw-r--r-- | arch/x86/include/asm/acpi.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/include/asm/acpi.h b/arch/x86/include/asm/acpi.h index 20d1465..4518dc5 100644 --- a/arch/x86/include/asm/acpi.h +++ b/arch/x86/include/asm/acpi.h @@ -144,7 +144,6 @@ 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) { } |