diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:11:43 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:11:43 -0500 |
| commit | f630fe2817601314b2eb7ca5ddc23c7834646731 (patch) | |
| tree | 3bfb4939b7bbc3859575ca8b58fa3f929b015941 /sound/soc/codecs/Kconfig | |
| parent | 48c871c1f6a7c7044dd76774fb469e65c7e2e4e8 (diff) | |
| parent | 8a03d9a498eaf02c8a118752050a5154852c13bf (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'sound/soc/codecs/Kconfig')
| -rw-r--r-- | sound/soc/codecs/Kconfig | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 78ac2688e124..ec2a2787957a 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig | |||
| @@ -1,15 +1,15 @@ | |||
| 1 | config SND_SOC_AC97_CODEC | 1 | config SND_SOC_AC97_CODEC |
| 2 | tristate | 2 | tristate |
| 3 | depends SND_SOC | 3 | depends on SND_SOC |
| 4 | 4 | ||
| 5 | config SND_SOC_WM8731 | 5 | config SND_SOC_WM8731 |
| 6 | tristate | 6 | tristate |
| 7 | depends SND_SOC | 7 | depends on SND_SOC |
| 8 | 8 | ||
| 9 | config SND_SOC_WM8750 | 9 | config SND_SOC_WM8750 |
| 10 | tristate | 10 | tristate |
| 11 | depends SND_SOC | 11 | depends on SND_SOC |
| 12 | 12 | ||
| 13 | config SND_SOC_WM9712 | 13 | config SND_SOC_WM9712 |
| 14 | tristate | 14 | tristate |
| 15 | depends SND_SOC | 15 | depends on SND_SOC |