diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-08 10:58:45 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-08 10:58:45 -0700 |
| commit | f589274533eb94e0217acc1db6240ce6e621bb56 (patch) | |
| tree | 884d4fde45bd578a240b4a61fe8de3b6a4c13880 /drivers | |
| parent | 625fc3a37511cbecfe1253867fe105c28d6a95f0 (diff) | |
| parent | e3a2efa67a029453b8098dba179ec2d9d8df612e (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
[ALSA] soc at91 minor bug fixes
[ALSA] soc - at91-pcm - Fix line wrapping
pcspkr: fix dependancies
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/input/misc/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig index 92b683411d5..3ad8bd9f754 100644 --- a/drivers/input/misc/Kconfig +++ b/drivers/input/misc/Kconfig @@ -14,7 +14,7 @@ if INPUT_MISC config INPUT_PCSPKR tristate "PC Speaker support" - depends on ALPHA || X86 || MIPS || PPC_PREP || PPC_CHRP || PPC_PSERIES + depends on PCSPKR_PLATFORM depends on SND_PCSP=n help Say Y here if you want the standard PC Speaker to be used for |