diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-12-06 07:22:28 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-12-06 07:22:28 -0500 |
| commit | 6c39d6aca10ffac15f6decb6afd9080549fc2392 (patch) | |
| tree | 532e75637e12b3a4424d6fc56da8370d5b419806 /sound/soc/kirkwood/Kconfig | |
| parent | a020428364485751b607105c8f5a608f9b1fd38b (diff) | |
| parent | cefcc03ffc9527dde56807339edb1719c8dbae5f (diff) | |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'sound/soc/kirkwood/Kconfig')
| -rw-r--r-- | sound/soc/kirkwood/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/kirkwood/Kconfig b/sound/soc/kirkwood/Kconfig index 8f49e165f4d1..c62d715235e2 100644 --- a/sound/soc/kirkwood/Kconfig +++ b/sound/soc/kirkwood/Kconfig | |||
| @@ -12,6 +12,7 @@ config SND_KIRKWOOD_SOC_I2S | |||
| 12 | config SND_KIRKWOOD_SOC_OPENRD | 12 | config SND_KIRKWOOD_SOC_OPENRD |
| 13 | tristate "SoC Audio support for Kirkwood Openrd Client" | 13 | tristate "SoC Audio support for Kirkwood Openrd Client" |
| 14 | depends on SND_KIRKWOOD_SOC && (MACH_OPENRD_CLIENT || MACH_OPENRD_ULTIMATE) | 14 | depends on SND_KIRKWOOD_SOC && (MACH_OPENRD_CLIENT || MACH_OPENRD_ULTIMATE) |
| 15 | depends on I2C | ||
| 15 | select SND_KIRKWOOD_SOC_I2S | 16 | select SND_KIRKWOOD_SOC_I2S |
| 16 | select SND_SOC_CS42L51 | 17 | select SND_SOC_CS42L51 |
| 17 | help | 18 | help |
| @@ -20,7 +21,7 @@ config SND_KIRKWOOD_SOC_OPENRD | |||
| 20 | 21 | ||
| 21 | config SND_KIRKWOOD_SOC_T5325 | 22 | config SND_KIRKWOOD_SOC_T5325 |
| 22 | tristate "SoC Audio support for HP t5325" | 23 | tristate "SoC Audio support for HP t5325" |
| 23 | depends on SND_KIRKWOOD_SOC && MACH_T5325 | 24 | depends on SND_KIRKWOOD_SOC && MACH_T5325 && I2C |
| 24 | select SND_KIRKWOOD_SOC_I2S | 25 | select SND_KIRKWOOD_SOC_I2S |
| 25 | select SND_SOC_ALC5623 | 26 | select SND_SOC_ALC5623 |
| 26 | help | 27 | help |