Skip to content

Commit

Permalink
Merge remote branch 'takashi/fix/asoc' into for-2.6.32
Browse files Browse the repository at this point in the history
  • Loading branch information
Mark Brown committed Oct 1, 2009
2 parents df1246d + c877c25 commit 834eb6c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion sound/soc/pxa/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 834eb6c

Please sign in to comment.