aboutsummaryrefslogtreecommitdiff
path: root/arch/x86/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-02-25 14:02:33 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-02-25 14:02:33 -0800
commit958ede7f1b72b29cd0d29ec88ee2bcb4c87dab61 (patch)
tree31098a5fd8cb6b59f20d56557551881dfe8a410c /arch/x86/include
parentd40358509ee862d7e4049187bc05eba1911a2959 (diff)
parent7f74f8f28a2bd9db9404f7d364e2097a0c42cc12 (diff)
downloadlinux-linaro-android-958ede7f1b72b29cd0d29ec88ee2bcb4c87dab61.tar.gz
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86 quirk: Fix polarity for IRQ0 pin2 override on SB800 systems x86/mrst: Fix apb timer rating when lapic timer is used x86: Fix reboot problem on VersaLogic Menlow boards
Diffstat (limited to 'arch/x86/include')
-rw-r--r--arch/x86/include/asm/acpi.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/acpi.h b/arch/x86/include/asm/acpi.h
index 211ca3f7fd1..4ea15ca89b2 100644
--- a/arch/x86/include/asm/acpi.h
+++ b/arch/x86/include/asm/acpi.h
@@ -88,6 +88,7 @@ extern int acpi_disabled;
extern int acpi_pci_disabled;
extern int acpi_skip_timer_override;
extern int acpi_use_timer_override;
+extern int acpi_fix_pin2_polarity;
extern u8 acpi_sci_flags;
extern int acpi_sci_override_gsi;