Merge branch 'timers-cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 412c21b..27b8a7a 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1007,14 +1007,19 @@ config ELF_CORE
        help
          Enable support for generating core dumps. Disabling saves about 4k.
 
+
 config PCSPKR_PLATFORM
        bool "Enable PC-Speaker support" if EXPERT
-       depends on ALPHA || X86 || MIPS || PPC_PREP || PPC_CHRP || PPC_PSERIES
+       depends on HAVE_PCSPKR_PLATFORM
+       select I8253_LOCK
        default y
        help
           This option allows to disable the internal PC-Speaker
           support, saving some memory.
 
+config HAVE_PCSPKR_PLATFORM
+       bool
+
 config BASE_FULL
        default y
        bool "Enable full-sized data structures for core" if EXPERT