diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-12-02 19:33:53 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-12-02 19:33:53 +0300 |
| commit | 2ff38c9fbaa86264ad819117ab137361067ab5f1 (patch) | |
| tree | 154e163934796d5c82afdf0633ce3d197f6bb1f4 /sound/soc/omap | |
| parent | c949e3d685b661412bfcd93d9c5956f125c1e060 (diff) | |
| parent | af745bd724e304cc94a88a2fb43d53baffbd63a5 (diff) | |
| download | linux-2ff38c9fbaa86264ad819117ab137361067ab5f1.tar.xz | |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'sound/soc/omap')
| -rw-r--r-- | sound/soc/omap/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig index d542ea2ff6be..a088db6d5091 100644 --- a/sound/soc/omap/Kconfig +++ b/sound/soc/omap/Kconfig @@ -12,8 +12,8 @@ config SND_OMAP_SOC_MCPDM config SND_OMAP_SOC_N810 tristate "SoC Audio support for Nokia N810" depends on SND_OMAP_SOC && MACH_NOKIA_N810 && I2C + depends on OMAP_MUX select SND_OMAP_SOC_MCBSP - select OMAP_MUX select SND_SOC_TLV320AIC3X help Say Y if you want to add support for SoC audio on Nokia N810. |