diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-29 03:45:15 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-29 03:45:15 -0500 |
| commit | e1df957670aef74ffd9a4ad93e6d2c90bf6b4845 (patch) | |
| tree | bca1fcfef55b3e3e82c9a822b4ac6428fce2b419 /sound/drivers/Kconfig | |
| parent | 2b583d8bc8d7105b58d7481a4a0ceb718dac49c6 (diff) | |
| parent | 3c92ec8ae91ecf59d88c798301833d7cf83f2179 (diff) | |
Merge branch 'linus' into perfcounters/core
Conflicts:
fs/exec.c
include/linux/init_task.h
Simple context conflicts.
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 255fd18b9aec..0bcf14640fde 100644 --- a/sound/drivers/Kconfig +++ b/sound/drivers/Kconfig | |||
| @@ -163,7 +163,7 @@ config SND_ML403_AC97CR | |||
| 163 | 163 | ||
| 164 | config SND_AC97_POWER_SAVE | 164 | config SND_AC97_POWER_SAVE |
| 165 | bool "AC97 Power-Saving Mode" | 165 | bool "AC97 Power-Saving Mode" |
| 166 | depends on SND_AC97_CODEC && EXPERIMENTAL | 166 | depends on SND_AC97_CODEC |
| 167 | default n | 167 | default n |
| 168 | help | 168 | help |
| 169 | Say Y here to enable the aggressive power-saving support of | 169 | Say Y here to enable the aggressive power-saving support of |