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 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild...
[pandora-kernel.git]
/
drivers
/
input
/
misc
/
pcspkr.c
diff --git
a/drivers/input/misc/pcspkr.c
b/drivers/input/misc/pcspkr.c
index
4941a9e
..
43aaa5c
100644
(file)
--- 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");
-#if
def CONFIG_X86
+#if
defined(CONFIG_MIPS) || defined(CONFIG_X86)
/* Use the global PIT lock ! */
#include <asm/i8253.h>
#else