leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pcsp - Don't build pcspkr when snd-pcsp is enabled

Browse Source 
- 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>
This commit is contained in:
Stas Sergeev 2008-04-23 10:50:32 +02:00 committed by Takashi Iwai
parent a0b8f7d89b
commit 5bae419952
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CREDITS
View File

@ -403,6 +403,8 @@ D: Linux CD and Support Giveaway List
N: Erik Inge Bolsø N: Erik Inge Bolsø
E: knan@mo.himolde.no E: knan@mo.himolde.no
D: Misc kernel hacks D: Misc kernel hacks
D: Updated PC speaker driver for 2.3
S: Norway
N: Andreas E. Bombe N: Andreas E. Bombe
E: andreas.bombe@munich.netsurf.de E: andreas.bombe@munich.netsurf.de
@ -3116,6 +3118,12 @@ S: Post Office Box 64132
S: Sunnyvale, California 94088-4132 S: Sunnyvale, California 94088-4132
S: USA S: USA
N: Stas Sergeev
E: stsp@users.sourceforge.net
D: PCM PC-Speaker driver
D: misc fixes
S: Russia
N: Simon Shapiro N: Simon Shapiro
E: shimon@i-Connect.Net E: shimon@i-Connect.Net
W: http://www.-i-Connect.Net/~shimon W: http://www.-i-Connect.Net/~shimon

1
drivers/input/misc/Kconfig
View File

@ -15,6 +15,7 @@ if INPUT_MISC
config INPUT_PCSPKR config INPUT_PCSPKR
tristate "PC Speaker support" tristate "PC Speaker support"
depends on ALPHA || X86 || MIPS || PPC_PREP || PPC_CHRP || PPC_PSERIES depends on ALPHA || X86 || MIPS || PPC_PREP || PPC_CHRP || PPC_PSERIES
depends on SND_PCSP=n
help help
Say Y here if you want the standard PC Speaker to be used for Say Y here if you want the standard PC Speaker to be used for
bells and whistles. bells and whistles.