diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-09 16:22:17 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-09 16:22:17 +0100 |
| commit | ceb8ef5e6dd55ddcfd875262f83c824f01f02181 (patch) | |
| tree | bb2a860519449e5a8b28eefb3f52dbfbbda3529a /arch/arm/mach-exynos | |
| parent | Merge remote-tracking branch 'asoc/topic/rt5631' into asoc-next (diff) | |
| parent | ASoC: Samsung: Do not register samsung audio dma device as pdev (diff) | |
| download | linux-ceb8ef5e6dd55ddcfd875262f83c824f01f02181.tar.xz linux-ceb8ef5e6dd55ddcfd875262f83c824f01f02181.zip | |
Merge remote-tracking branch 'asoc/topic/samsung' into asoc-next
Diffstat (limited to 'arch/arm/mach-exynos')
| -rw-r--r-- | arch/arm/mach-exynos/mach-armlex4210.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-exynos/mach-smdkv310.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-exynos/mach-armlex4210.c b/arch/arm/mach-exynos/mach-armlex4210.c index 3f37a5e8a1f4..b938f9fc1dd1 100644 --- a/arch/arm/mach-exynos/mach-armlex4210.c +++ b/arch/arm/mach-exynos/mach-armlex4210.c @@ -147,7 +147,6 @@ static struct platform_device *armlex4210_devices[] __initdata = { &s3c_device_hsmmc3, &s3c_device_rtc, &s3c_device_wdt, - &samsung_asoc_dma, &armlex4210_smsc911x, &exynos4_device_ahci, }; diff --git a/arch/arm/mach-exynos/mach-smdkv310.c b/arch/arm/mach-exynos/mach-smdkv310.c index ee4fb1a9cb72..5de9ee28a508 100644 --- a/arch/arm/mach-exynos/mach-smdkv310.c +++ b/arch/arm/mach-exynos/mach-smdkv310.c @@ -311,7 +311,6 @@ static struct platform_device *smdkv310_devices[] __initdata = { &s5p_device_mfc_l, &s5p_device_mfc_r, &exynos4_device_spdif, - &samsung_asoc_dma, &samsung_asoc_idma, &s5p_device_fimd0, &smdkv310_device_audio, |