diff options
| author | Stas Sergeev <stsp@aknet.ru> | 2008-04-23 04:50:32 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-04-24 06:00:42 -0400 |
| commit | 5bae4199522c56110d33e6fd925c052bc5ae36a1 (patch) | |
| tree | cd4cc6a675f0a4d34f590c05c6032f81b76e161e /drivers/input/misc | |
| parent | a0b8f7d89b8de0cc79999b9fdd3a303912f3b2a3 (diff) | |
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/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig index c5263d63aca3..92b683411d5a 100644 --- a/drivers/input/misc/Kconfig +++ b/drivers/input/misc/Kconfig | |||
| @@ -15,6 +15,7 @@ if INPUT_MISC | |||
| 15 | config INPUT_PCSPKR | 15 | config INPUT_PCSPKR |
| 16 | tristate "PC Speaker support" | 16 | tristate "PC Speaker support" |
| 17 | depends on ALPHA || X86 || MIPS || PPC_PREP || PPC_CHRP || PPC_PSERIES | 17 | depends on ALPHA || X86 || MIPS || PPC_PREP || PPC_CHRP || PPC_PSERIES |
| 18 | depends on SND_PCSP=n | ||
| 18 | help | 19 | help |
| 19 | Say Y here if you want the standard PC Speaker to be used for | 20 | Say Y here if you want the standard PC Speaker to be used for |
| 20 | bells and whistles. | 21 | bells and whistles. |