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 /sound/drivers/Kconfig | |
| 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 'sound/drivers/Kconfig')
| -rw-r--r-- | sound/drivers/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/drivers/Kconfig b/sound/drivers/Kconfig index a78a8d04517..379bcb07446 100644 --- a/sound/drivers/Kconfig +++ b/sound/drivers/Kconfig @@ -5,8 +5,8 @@ menu "Generic devices" config SND_PCSP - tristate "Internal PC speaker support" - depends on X86_PC && HIGH_RES_TIMERS + tristate "PC-Speaker support" + depends on PCSPKR_PLATFORM && X86_PC && HIGH_RES_TIMERS depends on INPUT depends on SND select SND_PCM |