diff options
| author | Stas Sergeev <stsp@aknet.ru> | 2008-04-23 10:50:32 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-04-24 12:00:42 +0200 |
| commit | 5bae4199522c56110d33e6fd925c052bc5ae36a1 (patch) | |
| tree | cd4cc6a675f0a4d34f590c05c6032f81b76e161e | |
| parent | a0b8f7d89b8de0cc79999b9fdd3a303912f3b2a3 (diff) | |
| download | linux-3.10-5bae4199522c56110d33e6fd925c052bc5ae36a1.tar.gz linux-3.10-5bae4199522c56110d33e6fd925c052bc5ae36a1.tar.bz2 linux-3.10-5bae4199522c56110d33e6fd925c052bc5ae36a1.zip | |
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>
| -rw-r--r-- | CREDITS | 8 | ||||
| -rw-r--r-- | drivers/input/misc/Kconfig | 1 |
2 files changed, 9 insertions, 0 deletions
@@ -403,6 +403,8 @@ D: Linux CD and Support Giveaway List N: Erik Inge Bolsø E: knan@mo.himolde.no D: Misc kernel hacks +D: Updated PC speaker driver for 2.3 +S: Norway N: Andreas E. Bombe E: andreas.bombe@munich.netsurf.de @@ -3116,6 +3118,12 @@ S: Post Office Box 64132 S: Sunnyvale, California 94088-4132 S: USA +N: Stas Sergeev +E: stsp@users.sourceforge.net +D: PCM PC-Speaker driver +D: misc fixes +S: Russia + N: Simon Shapiro E: shimon@i-Connect.Net W: http://www.-i-Connect.Net/~shimon diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig index c5263d63aca..92b683411d5 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. |