summaryrefslogtreecommitdiffstats
path: root/include/linux/hpet.h
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2008-04-04 16:26:10 +0200
committerIngo Molnar <mingo@elte.hu>2008-04-04 18:36:49 +0200
commit5761d64b277c287a7520b868c32d656ef03374b4 (patch)
tree9fb217efd1a50ed4d5fbf5c313cae586604d6f2f /include/linux/hpet.h
parent47001d603375f857a7fab0e9c095d964a1ea0039 (diff)
downloadlinux-5761d64b277c287a7520b868c32d656ef03374b4.tar.gz
linux-5761d64b277c287a7520b868c32d656ef03374b4.tar.bz2
linux-5761d64b277c287a7520b868c32d656ef03374b4.zip
x86: revert assign IRQs to hpet timer
The commits: commit 37a47db8d7f0f38dac5acf5a13abbc8f401707fa Author: Balaji Rao <balajirrao@gmail.com> Date: Wed Jan 30 13:30:03 2008 +0100 x86: assign IRQs to HPET timers, fix and commit e3f37a54f690d3e64995ea7ecea08c5ab3070faf Author: Balaji Rao <balajirrao@gmail.com> Date: Wed Jan 30 13:30:03 2008 +0100 x86: assign IRQs to HPET timers have been identified to cause a regression on some platforms due to the assignement of legacy IRQs which makes the legacy devices connected to those IRQs disfunctional. Revert them. This fixes http://bugzilla.kernel.org/show_bug.cgi?id=10382 Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/hpet.h')
-rw-r--r--include/linux/hpet.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/hpet.h b/include/linux/hpet.h
index 9cd94bfd07e5..2dc29ce6c8e4 100644
--- a/include/linux/hpet.h
+++ b/include/linux/hpet.h
@@ -64,7 +64,7 @@ struct hpet {
*/
#define Tn_INT_ROUTE_CAP_MASK (0xffffffff00000000ULL)
-#define Tn_INT_ROUTE_CAP_SHIFT (32UL)
+#define Tn_INI_ROUTE_CAP_SHIFT (32UL)
#define Tn_FSB_INT_DELCAP_MASK (0x8000UL)
#define Tn_FSB_INT_DELCAP_SHIFT (15)
#define Tn_FSB_EN_CNF_MASK (0x4000UL)