summaryrefslogtreecommitdiffstats
path: root/sound
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 /sound
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol... (diff)
downloadlinux-e5e1d3cb20034a3cbcfff1f0bae12201aa2ce17e.tar.xz
linux-e5e1d3cb20034a3cbcfff1f0bae12201aa2ce17e.zip
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 'sound')
-rw-r--r--sound/drivers/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/drivers/Kconfig b/sound/drivers/Kconfig
index a78a8d045175..379bcb074463 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