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

Commit 2625240d authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-2.6.30' into for-2.6.31

parents 1a4ba05e 0c95de73

sound/soc/codecs/wm8350.c

+1 −1
Original line number Diff line number Diff line
@@ -968,7 +968,7 @@ static int wm8350_pcm_trigger(struct snd_pcm_substream *substream, 
	 * required for LRC in master mode. The DACs or ADCs need a

	 * valid audio path i.e. pin -> ADC or DAC -> pin before

	 * the LRC will be enabled in master mode. */

	if (!master && cmd != SNDRV_PCM_TRIGGER_START)

	if (!master || cmd != SNDRV_PCM_TRIGGER_START)

		return 0;



	if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) {

sound/soc/fsl/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ config SND_SOC_MPC8610_HPCD 


config SND_SOC_MPC5200_I2S

	tristate "Freescale MPC5200 PSC in I2S mode driver"

	depends on PPC_MPC52xx && PPC_BESTCOMM

	depends on PPC_MPC52xx && PPC_BESTCOMM && BROKEN

	select SND_SOC_OF_SIMPLE

	select PPC_BESTCOMM_GEN_BD

	help