diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2012-05-12 10:31:37 +0400 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-05-12 10:31:37 +0400 |
| commit | ad28536a898fbdc8c57d64348e310e1bda776963 (patch) | |
| tree | b057f2d095797399ce6ef01312359712e4b67b15 /arch/arm/mach-exynos/mach-smdkv310.c | |
| parent | 18c411b7974f47f84c29507bdf3e0573890c0f0e (diff) | |
| parent | 2a96536e77b43cf1e70ab3ad8b46b98ab52b56c1 (diff) | |
| download | linux-ad28536a898fbdc8c57d64348e310e1bda776963.tar.xz | |
Merge branch 'next/devel-samsung-iommu' into next/devel-samsung
Conflicts:
arch/arm/mach-exynos/Makefile
Diffstat (limited to 'arch/arm/mach-exynos/mach-smdkv310.c')
| -rw-r--r-- | arch/arm/mach-exynos/mach-smdkv310.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-exynos/mach-smdkv310.c b/arch/arm/mach-exynos/mach-smdkv310.c index 83b91fa777c1..495c7e502be1 100644 --- a/arch/arm/mach-exynos/mach-smdkv310.c +++ b/arch/arm/mach-exynos/mach-smdkv310.c @@ -281,7 +281,6 @@ static struct platform_device *smdkv310_devices[] __initdata = { &s5p_device_mfc_l, &s5p_device_mfc_r, &exynos4_device_spdif, - &exynos4_device_sysmmu, &samsung_asoc_dma, &samsung_asoc_idma, &s5p_device_fimd0, |