diff options
author | Kukjin Kim <kgene.kim@samsung.com> | 2012-05-15 15:55:25 +0900 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-05-15 15:55:25 +0900 |
commit | 0f58487b1e313e6abf500431e05f4d54f61736f2 (patch) | |
tree | 6e4e093e548c168c2a90330a08d33cd43240f13d /arch/arm/mach-exynos/mach-armlex4210.c | |
parent | 36be50515fe2aef61533b516fa2576a2c7fe7664 (diff) | |
parent | 199642bfe107c411f25fbfc16c9fd49cfef9785d (diff) | |
download | kernel_goldelico_gta04-0f58487b1e313e6abf500431e05f4d54f61736f2.zip kernel_goldelico_gta04-0f58487b1e313e6abf500431e05f4d54f61736f2.tar.gz kernel_goldelico_gta04-0f58487b1e313e6abf500431e05f4d54f61736f2.tar.bz2 |
Merge branch 'next/cleanup-plat-s5p' into next/devel-exynos5250-1
Diffstat (limited to 'arch/arm/mach-exynos/mach-armlex4210.c')
-rw-r--r-- | arch/arm/mach-exynos/mach-armlex4210.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-exynos/mach-armlex4210.c b/arch/arm/mach-exynos/mach-armlex4210.c index d726fcd..6ce2148 100644 --- a/arch/arm/mach-exynos/mach-armlex4210.c +++ b/arch/arm/mach-exynos/mach-armlex4210.c @@ -157,7 +157,6 @@ static struct platform_device *armlex4210_devices[] __initdata = { &s3c_device_hsmmc3, &s3c_device_rtc, &s3c_device_wdt, - &exynos4_device_sysmmu, &samsung_asoc_dma, &armlex4210_smsc911x, &exynos4_device_ahci, |