diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-29 09:38:52 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-29 09:38:52 -0700 |
commit | 25a025863e024f6b86b48137b10b4960c50351b0 (patch) | |
tree | 72d2521585f61d904769d28cf1d7687b949a61a6 /sound/drivers/Kconfig | |
parent | 1f43c5393033de90bac4410352b1d2a69dcbe7ef (diff) | |
parent | 7e48bf653c37eb32c2ba4c13f15aa154aa807e61 (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 - wm9712 - checkpatch fixes
[ALSA] pcsp - Fix more dependency
[ALSA] hda - Add support of Medion RIM 2150
[ALSA] ASoC: Add drivers for the Texas Instruments OMAP processors
[ALSA] ice1724 - Enable watermarks
[ALSA] Add MPU401_INFO_NO_ACK bitflag
Diffstat (limited to 'sound/drivers/Kconfig')
-rw-r--r-- | sound/drivers/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/drivers/Kconfig b/sound/drivers/Kconfig index fe85af1c569..a78a8d04517 100644 --- a/sound/drivers/Kconfig +++ b/sound/drivers/Kconfig @@ -8,6 +8,8 @@ config SND_PCSP tristate "Internal PC speaker support" depends on X86_PC && HIGH_RES_TIMERS depends on INPUT + depends on SND + select SND_PCM help If you don't have a sound card in your computer, you can include a driver for the PC speaker which allows it to act like a primitive |