diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-08 10:58:45 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-08 10:58:45 -0700 |
| commit | f589274533eb94e0217acc1db6240ce6e621bb56 (patch) | |
| tree | 884d4fde45bd578a240b4a61fe8de3b6a4c13880 /init | |
| parent | 625fc3a37511cbecfe1253867fe105c28d6a95f0 (diff) | |
| parent | e3a2efa67a029453b8098dba179ec2d9d8df612e (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
[ALSA] soc at91 minor bug fixes
[ALSA] soc - at91-pcm - Fix line wrapping
pcspkr: fix dependancies
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 8 |
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 |