summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorStas Sergeev <stsp@aknet.ru>2008-05-07 12:39:56 +0200
committerTakashi Iwai <tiwai@suse.de>2008-05-07 12:42:03 +0200
commite5e1d3cb20034a3cbcfff1f0bae12201aa2ce17e (patch)
treef1260a7e59ac21b790c76c1539e71603359806ad /init
parenta15306365a16380f3bafee9e181ba01231d4acd7 (diff)
pcspkr: fix dependancies
fix pcspkr dependancies: make the pcspkr platform drivers to depend on a platform device, and not the other way around. Signed-off-by: Stas Sergeev <stsp@aknet.ru> Acked-by: Thomas Gleixner <tglx@linutronix.de> Acked-by: Dmitry Torokhov <dtor@mail.ru> CC: Vojtech Pavlik <vojtech@suse.cz> CC: Michael Opdenacker <michael-lists@free-electrons.com> [fixed for 2.6.26-rc1 by tiwai] Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'init')
-rw-r--r--init/Kconfig8
1 files changed, 8 insertions, 0 deletions
diff --git a/init/Kconfig b/init/Kconfig
index 4c33316743f..3b5adbf228c 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -634,6 +634,14 @@ config ELF_CORE
help
Enable support for generating core dumps. Disabling saves about 4k.
+config PCSPKR_PLATFORM
+ bool "Enable PC-Speaker support" if EMBEDDED
+ depends on ALPHA || X86 || MIPS || PPC_PREP || PPC_CHRP || PPC_PSERIES
+ default y
+ help
+ This option allows to disable the internal PC-Speaker
+ support, saving some memory.
+
config COMPAT_BRK
bool "Disable heap randomization"
default y