git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'writeback' of git://git.kernel.dk/linux-2.6-block
[pandora-kernel.git]
/
arch
/
x86
/
include
/
asm
/
acpi.h
diff --git
a/arch/x86/include/asm/acpi.h
b/arch/x86/include/asm/acpi.h
index
20d1465
..
4518dc5
100644
(file)
--- 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) { }