summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c24xx/s3c2443.c
diff options
context:
space:
mode:
authorArnd Bergmann2013-04-19 23:12:42 +0200
committerArnd Bergmann2013-04-19 23:12:42 +0200
commit22cf644e03419b4c3d002109b021c7482306f0bf (patch)
treedb426bcf5d4f7acfdbcaa5276b87d12cbb061fa1 /arch/arm/mach-s3c24xx/s3c2443.c
parentLinux 3.9-rc6 (diff)
parentARM: exynos: restore mach/regs-clock.h for exynos5 (diff)
downloadkernel-qcow2-linux-22cf644e03419b4c3d002109b021c7482306f0bf.tar.gz
kernel-qcow2-linux-22cf644e03419b4c3d002109b021c7482306f0bf.tar.xz
kernel-qcow2-linux-22cf644e03419b4c3d002109b021c7482306f0bf.zip
Merge branch 'next/drivers' into late/multiplatform
Multiple parts of next/drivers are prerequisites for the final exynos multiplatform changes, so let's pull in the entire branch. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-s3c24xx/s3c2443.c')
-rw-r--r--arch/arm/mach-s3c24xx/s3c2443.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c24xx/s3c2443.c b/arch/arm/mach-s3c24xx/s3c2443.c
index 165b6a6b3daa..8328cd65bf3d 100644
--- a/arch/arm/mach-s3c24xx/s3c2443.c
+++ b/arch/arm/mach-s3c24xx/s3c2443.c
@@ -36,7 +36,6 @@
#include <plat/gpio-core.h>
#include <plat/gpio-cfg.h>
#include <plat/gpio-cfg-helpers.h>
-#include <plat/s3c2443.h>
#include <plat/devs.h>
#include <plat/cpu.h>
#include <plat/fb-core.h>