linux-stable/sound/soc/pxa
Mark Brown c91cf25ebf ASoC: Fix merge with PXA tree
Fix a merge issue caused by context overlap.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2009-01-23 11:23:32 +00:00
..
corgi.c ASoC: Push platform registration down into the card 2008-12-02 16:03:40 +00:00
e740_wm9705.c ASoC: machine support for Toshiba e740 PDA 2009-01-19 16:15:41 +00:00
e750_wm9705.c ASoC: machine driver for Toshiba e750 2009-01-16 16:40:26 +00:00
e800_wm9712.c ASoC: Fix merge with PXA tree 2009-01-23 11:23:32 +00:00
em-x270.c ASoC: Push platform registration down into the card 2008-12-02 16:03:40 +00:00
Kconfig ASoC: machine support for Toshiba e740 PDA 2009-01-19 16:15:41 +00:00
Makefile ASoC: machine support for Toshiba e740 PDA 2009-01-19 16:15:41 +00:00
palm27x.c ASoC: Push platform registration down into the card 2008-12-02 16:03:40 +00:00
poodle.c ASoC: Push platform registration down into the card 2008-12-02 16:03:40 +00:00
pxa-ssp.c ALSA: ASoC - Fix wrong section types 2008-12-10 07:47:22 +01:00
pxa-ssp.h ASoC: Add PXA SSP support 2008-10-30 15:45:21 +00:00
pxa2xx-ac97.c Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm 2008-12-30 17:36:49 -08:00
pxa2xx-ac97.h ALSA: asoc: pxa - merge structs snd_soc_codec_dai and snd_soc_cpu_dai. 2008-07-10 09:32:43 +02:00
pxa2xx-i2s.c ASoC: Register platform DAIs 2008-12-09 10:49:27 +00:00
pxa2xx-i2s.h ALSA: asoc: pxa - merge structs snd_soc_codec_dai and snd_soc_cpu_dai. 2008-07-10 09:32:43 +02:00
pxa2xx-pcm.c ASoC: Fix pxa2xx-pcm checks for invalid DMA channels 2009-01-01 11:52:48 +00:00
pxa2xx-pcm.h ALSA: Separate common pxa2xx-pcm code 2008-09-23 08:18:10 +02:00
spitz.c ASoC: Push platform registration down into the card 2008-12-02 16:03:40 +00:00
tosa.c ASoC: Push platform registration down into the card 2008-12-02 16:03:40 +00:00
zylonite.c ASoC: Implement support for CLK_POUT as MCLK on Zylonite 2009-01-19 16:15:35 +00:00