Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 834eb6c5 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote branch 'takashi/fix/asoc' into for-2.6.32

parents df1246d8 c877c251

sound/soc/pxa/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ config SND_PXA2XX_SOC_MIOA701 


config SND_PXA2XX_SOC_IMOTE2

       tristate "SoC Audio support for IMote 2"

       depends on SND_PXA2XX_SOC && MACH_INTELMOTE2

       depends on SND_PXA2XX_SOC && MACH_INTELMOTE2 && I2C

       select SND_PXA2XX_SOC_I2S

       select SND_SOC_WM8940

       help