Skip to content

Commit

Permalink
pcsp - Don't build pcspkr when snd-pcsp is enabled
Browse files Browse the repository at this point in the history
- 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 <[email protected]>
  • Loading branch information
Stas Sergeev authored and tiwai committed Apr 24, 2008
1 parent a0b8f7d commit 5bae419
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 0 deletions.
8 changes: 8 additions & 0 deletions CREDITS
Original file line number Diff line number Diff line change
Expand Up @@ -403,6 +403,8 @@ D: Linux CD and Support Giveaway List
N: Erik Inge Bolsø
E: [email protected]
D: Misc kernel hacks
D: Updated PC speaker driver for 2.3
S: Norway

N: Andreas E. Bombe
E: [email protected]
Expand Down Expand Up @@ -3116,6 +3118,12 @@ S: Post Office Box 64132
S: Sunnyvale, California 94088-4132
S: USA

N: Stas Sergeev
E: [email protected]
D: PCM PC-Speaker driver
D: misc fixes
S: Russia

N: Simon Shapiro
E: [email protected]
W: http://www.-i-Connect.Net/~shimon
Expand Down
1 change: 1 addition & 0 deletions drivers/input/misc/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 5bae419

Please sign in to comment.