OpenE2K/linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
89cab4624a
linux/sound/soc/samsung
History
Mark Brown 89cab4624a ASoC: core: Merge Samsung fixes to avoid trivial context conflict 
Merge branch 'fix/samsung' of
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into
asoc-component to resolve trivial conflict

Conflicts:
	sound/soc/samsung/i2s.c
2013-04-03 18:22:51 +01:00
..
ac97.c ASoC: switch over to use snd_soc_register_component() on s3c ac97 2013-03-26 21:57:37 +00:00
bells.c ASoC: Samsung: remove __dev* attributes 2012-12-10 00:30:19 +09:00
dma.c ASoC: samsung: Add DT support for i2s 2013-01-29 12:47:46 +08:00
dma.h ASoC: samsung: Add DT support for i2s 2013-01-29 12:47:46 +08:00
goni_wm8994.c ASoC: switch over to use snd_soc_register_component() on goni_wm8994 2013-03-26 21:57:42 +00:00
h1940_uda1380.c ARM: S3C24XX: make h1940.h and h1940-latch.h local 2013-01-10 10:45:35 -08:00
i2s-regs.h ASoC: SAMSUNG: Add idma related register definition 2011-06-26 12:05:23 +01:00
i2s.c ASoC: core: Merge Samsung fixes to avoid trivial context conflict 2013-04-03 18:22:51 +01:00
i2s.h ASoC: samsung: Rename samsung i2s secondary device name 2013-01-24 14:40:13 +08:00
idma.c ASoC: Samsung: remove __dev* attributes 2012-12-10 00:30:19 +09:00
idma.h ASoC: Fix __iomem annotation for IDMA registers 2011-11-29 17:28:16 +00:00
jive_wm8750.c ASoC: Samsung: Do not register samsung audio dma device as pdev 2012-12-07 19:36:07 +09:00
Kconfig ASoC: Samsung: Update Kconfig for I2S,SPDIF and PCM audio 2013-01-29 15:36:28 +08:00
littlemill.c ASoC: Samsung: remove __dev* attributes 2012-12-10 00:30:19 +09:00
ln2440sbc_alc650.c ASoC: Samsung: Do not register samsung audio dma device as pdev 2012-12-07 19:36:07 +09:00
lowland.c ASoC: Samsung: remove __dev* attributes 2012-12-10 00:30:19 +09:00
Makefile ASoC: bells: Add machine driver for Wolfson Bells boards 2012-08-09 19:34:30 +01:00
neo1973_wm8753.c ARM: S3C24XX: make gta02.h local 2013-01-10 10:45:35 -08:00
pcm.c ASoC: switch over to use snd_soc_register_component() on samsung pcm 2013-03-26 21:57:41 +00:00
pcm.h
regs-i2s-v2.h
rx1950_uda1380.c ASoC: Samsung: Do not register samsung audio dma device as pdev 2012-12-07 19:36:07 +09:00
s3c24xx_simtec_hermes.c ASoC: Samsung: remove __dev* attributes 2012-12-10 00:30:19 +09:00
s3c24xx_simtec_tlv320aic23.c ASoC: Samsung: remove __dev* attributes 2012-12-10 00:30:19 +09:00
s3c24xx_simtec.c ASoC: Samsung: remove __dev* attributes 2012-12-10 00:30:19 +09:00
s3c24xx_simtec.h
s3c24xx_uda134x.c ASoC: Samsung: Do not register samsung audio dma device as pdev 2012-12-07 19:36:07 +09:00
s3c24xx-i2s.c ASoC: switch over to use snd_soc_register_component() on s3c24xx i2s 2013-03-26 21:57:30 +00:00
s3c24xx-i2s.h
s3c2412-i2s.c ASoC: switch over to use snd_soc_register_component() on s3c i2s 2013-03-26 21:57:31 +00:00
s3c2412-i2s.h
s3c-i2s-v2.c ASoC: switch over to use snd_soc_register_component() on s3c i2s 2013-03-26 21:57:31 +00:00
s3c-i2s-v2.h ASoC: switch over to use snd_soc_register_component() on s3c i2s 2013-03-26 21:57:31 +00:00
smartq_wm8987.c ASoC: Samsung: Do not register samsung audio dma device as pdev 2012-12-07 19:36:07 +09:00
smdk2443_wm9710.c ASoC: Samsung: Do not register samsung audio dma device as pdev 2012-12-07 19:36:07 +09:00
smdk_spdif.c ASoC: Samsung: Do not register samsung audio dma device as pdev 2012-12-07 19:36:07 +09:00
smdk_wm8580.c ASoC: samsung: Rename samsung i2s secondary device name 2013-01-24 14:40:13 +08:00
smdk_wm8580pcm.c ASoC: Samsung: remove __dev* attributes 2012-12-10 00:30:19 +09:00
smdk_wm8994.c ASoC: SMDK: WM8994: Add device tree support for machine file 2013-01-29 15:36:28 +08:00
smdk_wm8994pcm.c ASoC: Samsung: remove __dev* attributes 2012-12-10 00:30:19 +09:00
smdk_wm9713.c ASoC: Samsung: Do not register samsung audio dma device as pdev 2012-12-07 19:36:07 +09:00
spdif.c ASoC: switch over to use snd_soc_register_component() on samsung spdif 2013-03-26 21:57:39 +00:00
spdif.h
speyside.c ASoC: Samsung: remove __dev* attributes 2012-12-10 00:30:19 +09:00
tobermory.c ASoC: Samsung: remove __dev* attributes 2012-12-10 00:30:19 +09:00