aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/misc
diff options
context:
space:
mode:
authorStas Sergeev <stsp@aknet.ru>2008-04-23 10:50:32 +0200
committerTakashi Iwai <tiwai@suse.de>2008-04-24 12:00:42 +0200
commit5bae4199522c56110d33e6fd925c052bc5ae36a1 (patch)
treecd4cc6a675f0a4d34f590c05c6032f81b76e161e /drivers/input/misc
parenta0b8f7d89b8de0cc79999b9fdd3a303912f3b2a3 (diff)
downloadkernel_samsung_smdk4412-5bae4199522c56110d33e6fd925c052bc5ae36a1.zip
kernel_samsung_smdk4412-5bae4199522c56110d33e6fd925c052bc5ae36a1.tar.gz
kernel_samsung_smdk4412-5bae4199522c56110d33e6fd925c052bc5ae36a1.tar.bz2
pcsp - Don't build pcspkr when snd-pcsp is enabled
- Update CREDITS with the pc-speaker driver authors. - Prevent pcspkr from being built together with snd-pcsp. Both pcspkr and snd-pcsp use the same platform driver name "pcspkr". Signed-off-by: Stas Sergeev <stsp@aknet.ru>
Diffstat (limited to 'drivers/input/misc')
-rw-r--r--drivers/input/misc/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index c5263d6..92b6834 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -15,6 +15,7 @@ if INPUT_MISC
config INPUT_PCSPKR
tristate "PC Speaker support"
depends on ALPHA || X86 || MIPS || PPC_PREP || PPC_CHRP || PPC_PSERIES
+ depends on SND_PCSP=n
help
Say Y here if you want the standard PC Speaker to be used for
bells and whistles.