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

Commit 9eb34302 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'for-2.6.36' of... 

Merge branch 'for-2.6.36' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into topic/asoc
parents 9d7db2b2 04c09a15

arch/arm/plat-mxc/include/mach/ssi.h

+3 −0
Original line number Diff line number Diff line
@@ -10,6 +10,9 @@ struct imx_ssi_platform_data { 
	unsigned int flags;

#define IMX_SSI_DMA            (1 << 0)

#define IMX_SSI_USE_AC97       (1 << 1)

#define IMX_SSI_NET            (1 << 2)

#define IMX_SSI_SYN            (1 << 3)

#define IMX_SSI_USE_I2S_SLAVE  (1 << 4)

	void (*ac97_reset) (struct snd_ac97 *ac97);

	void (*ac97_warm_reset)(struct snd_ac97 *ac97);

};

sound/soc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ source "sound/soc/atmel/Kconfig" 
source "sound/soc/au1x/Kconfig"

source "sound/soc/blackfin/Kconfig"

source "sound/soc/davinci/Kconfig"

source "sound/soc/ep93xx/Kconfig"

source "sound/soc/fsl/Kconfig"

source "sound/soc/imx/Kconfig"

source "sound/soc/nuc900/Kconfig"

sound/soc/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ obj-$(CONFIG_SND_SOC) += atmel/ 
obj-$(CONFIG_SND_SOC)	+= au1x/

obj-$(CONFIG_SND_SOC)	+= blackfin/

obj-$(CONFIG_SND_SOC)	+= davinci/

obj-$(CONFIG_SND_SOC)	+= ep93xx/

obj-$(CONFIG_SND_SOC)	+= fsl/

obj-$(CONFIG_SND_SOC)   += imx/

obj-$(CONFIG_SND_SOC)	+= nuc900/

sound/soc/atmel/atmel-pcm.c

+0 −1
Original line number Diff line number Diff line
@@ -77,7 +77,6 @@ struct atmel_runtime_data { 
	size_t period_size;



	dma_addr_t period_ptr;		/* physical address of next period */

	int periods;			/* period index of period_ptr */



	/* PDC register save */

	u32 pdc_xpr_save;

sound/soc/atmel/atmel_ssc_dai.c

+0 −1
Original line number Diff line number Diff line
@@ -549,7 +549,6 @@ static int atmel_ssc_hw_params(struct snd_pcm_substream *substream, 
		printk(KERN_WARNING "atmel_ssc_dai: unsupported DAI format 0x%x\n",

			ssc_p->daifmt);

		return -EINVAL;

		break;

	}

	pr_debug("atmel_ssc_hw_params: "

			"RCMR=%08x RFMR=%08x TCMR=%08x TFMR=%08x\n",