summaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2011-06-01 19:04:59 +0100
committerThomas Gleixner <tglx@linutronix.de>2011-06-09 15:01:38 +0200
commit15f304b664c0d0a3e76ed3a9ce3615a86908babe (patch)
tree5203cc0ce3981a7055003e04dc7d9aab56457e48 /init
parentcb2455aa274b780802c593fecf115240a655d809 (diff)
downloadlinux-3.10-15f304b664c0d0a3e76ed3a9ce3615a86908babe.tar.gz
linux-3.10-15f304b664c0d0a3e76ed3a9ce3615a86908babe.tar.bz2
linux-3.10-15f304b664c0d0a3e76ed3a9ce3615a86908babe.zip
i8253: Consolidate all kernel definitions of i8253_lock
Move them to drivers/clocksource/i8253.c and remove the implementations in arch/ [ tglx: Avoid the extra file in lib - folded arch patches in. The export will become conditional in a later step ] Signed-off-by: Ralf Baechle <ralf@linux-mips.org> Link: http://lkml.kernel.org/r/20110601180610.221426078@duck.linux-mips.net Cc: Russell King <linux@arm.linux.org.uk> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'init')
-rw-r--r--init/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/init/Kconfig b/init/Kconfig
index ebafac4231e..2d2ef447a9a 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1002,6 +1002,7 @@ config ELF_CORE
config PCSPKR_PLATFORM
bool "Enable PC-Speaker support" if EXPERT
depends on ALPHA || X86 || MIPS || PPC_PREP || PPC_CHRP || PPC_PSERIES
+ select I8253_LOCK
default y
help
This option allows to disable the internal PC-Speaker