diff options
author | Kukjin Kim <kgene.kim@samsung.com> | 2012-05-12 15:31:37 +0900 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-05-12 15:31:37 +0900 |
commit | ad28536a898fbdc8c57d64348e310e1bda776963 (patch) | |
tree | b057f2d095797399ce6ef01312359712e4b67b15 /arch/arm/plat-samsung/include/plat/devs.h | |
parent | 18c411b7974f47f84c29507bdf3e0573890c0f0e (diff) | |
parent | 2a96536e77b43cf1e70ab3ad8b46b98ab52b56c1 (diff) |
Merge branch 'next/devel-samsung-iommu' into next/devel-samsung
Conflicts:
arch/arm/mach-exynos/Makefile
Diffstat (limited to 'arch/arm/plat-samsung/include/plat/devs.h')
-rw-r--r-- | arch/arm/plat-samsung/include/plat/devs.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/plat-samsung/include/plat/devs.h b/arch/arm/plat-samsung/include/plat/devs.h index 62e6251e4b19..61ca2f356c52 100644 --- a/arch/arm/plat-samsung/include/plat/devs.h +++ b/arch/arm/plat-samsung/include/plat/devs.h @@ -133,7 +133,6 @@ extern struct platform_device exynos4_device_pcm1; extern struct platform_device exynos4_device_pcm2; extern struct platform_device exynos4_device_pd[]; extern struct platform_device exynos4_device_spdif; -extern struct platform_device exynos4_device_sysmmu; extern struct platform_device exynos_device_drm; |