Merge branches 'x86-urgent-for-linus', 'core-debug-for-linus', 'irq-core-for-linus...

[pandora-kernel.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 412c21b..e20aa31 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -917,6 +917,8 @@ config ANON_INODES
 
 menuconfig EXPERT
        bool "Configure standard kernel features (expert users)"
+       # Unhide debug options, to make the on-by-default options visible
+       select DEBUG_KERNEL
        help
          This option allows certain base kernel options and settings
           to be disabled or tweaked. This is for specialized
@@ -1007,14 +1009,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