summaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2007-11-02 17:26:06 +0000
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-11-02 19:39:18 -0700
commit74521c28e550c4ec265cda14114bd9b908e9de34 (patch)
tree6e9ab675eb69329db5188783a11a76a826055531 /drivers/input
parenta89b7717a8c9be41a4856134b60a4d7a66df13f6 (diff)
downloadop-kernel-dev-74521c28e550c4ec265cda14114bd9b908e9de34.zip
op-kernel-dev-74521c28e550c4ec265cda14114bd9b908e9de34.tar.gz
Use i8253.c lock for PC speaker on MIPS, too.
The Jazz machines have to use the PIT timer for dyntick and highresolution kernels. This may break because currently just like i386 used to do MIPS uses two separate spinlocks in the actual PIT code and the PC speaker code. So switch to do it the same that x86 currently does PIT locking. Signed-off-by: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/misc/pcspkr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/misc/pcspkr.c b/drivers/input/misc/pcspkr.c
index 4941a9e..43aaa5c 100644
--- a/drivers/input/misc/pcspkr.c
+++ b/drivers/input/misc/pcspkr.c
@@ -24,7 +24,7 @@ MODULE_DESCRIPTION("PC Speaker beeper driver");
MODULE_LICENSE("GPL");
MODULE_ALIAS("platform:pcspkr");
-#ifdef CONFIG_X86
+#if defined(CONFIG_MIPS) || defined(CONFIG_X86)
/* Use the global PIT lock ! */
#include <asm/i8253.h>
#else
OpenPOWER on IntegriCloud