diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-05-04 10:00:16 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-05-04 10:00:16 -0400 |
| commit | 3a20ac2c52b1317f5a5f0bd9cd3cbe8495ddd026 (patch) | |
| tree | 9a912f2609cefb9698b5cce09cd240bd6dbd09fb /sound/drivers/Kconfig | |
| parent | 18cc8d8d9b74c446832336d8f6e1afb145f9431b (diff) | |
| parent | 3e5b50165fd0be080044586f43fcdd460ed27610 (diff) | |
Merge branch 'fix/pcm-jiffies-check' into fix/asoc
Diffstat (limited to 'sound/drivers/Kconfig')
| -rw-r--r-- | sound/drivers/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/drivers/Kconfig b/sound/drivers/Kconfig index 0bcf14640fde..84714a65e5c8 100644 --- a/sound/drivers/Kconfig +++ b/sound/drivers/Kconfig | |||
| @@ -33,7 +33,7 @@ if SND_DRIVERS | |||
| 33 | 33 | ||
| 34 | config SND_PCSP | 34 | config SND_PCSP |
| 35 | tristate "PC-Speaker support (READ HELP!)" | 35 | tristate "PC-Speaker support (READ HELP!)" |
| 36 | depends on PCSPKR_PLATFORM && X86_PC && HIGH_RES_TIMERS | 36 | depends on PCSPKR_PLATFORM && X86 && HIGH_RES_TIMERS |
| 37 | depends on INPUT | 37 | depends on INPUT |
| 38 | depends on EXPERIMENTAL | 38 | depends on EXPERIMENTAL |
| 39 | select SND_PCM | 39 | select SND_PCM |