diff options
author | Arnd Bergmann <arnd@arndb.de> | 2013-03-15 22:39:46 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2013-03-15 22:39:46 +0100 |
commit | 3cdb59d73ec63b42c49e43914c7de550d606159f (patch) | |
tree | 3621c67982461e79119cc73f0aa4782cd90c8dbb /arch/arm/mach-s3c24xx/mach-nexcoder.c | |
parent | f6161aa153581da4a3867a2d1a7caf4be19b6ec9 (diff) | |
parent | 7488335dcf382574c47fb27fcbad3f04a9841db6 (diff) |
Merge branch 'next/cleanup-s3c' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup
From Kukjin Kim <kgene.kim@samsung.com>:
Cleanups for the Samsung S3C24XX platforms.
* 'next/cleanup-s3c' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: S3C24XX: cleanup the included soc init functions in common.h
ARM: S3C24XX: move plat-samsung/s3c24XX headers to local common.h
ARM: S3C24XX: remove plat/irq.h in plat-samsung
ARM: S3C24XX: plat/common-smdk.h local
mmc: s3cmci: moved mach/regs-sdi.h into s3cmci device driver
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-s3c24xx/mach-nexcoder.c')
-rw-r--r-- | arch/arm/mach-s3c24xx/mach-nexcoder.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c24xx/mach-nexcoder.c b/arch/arm/mach-s3c24xx/mach-nexcoder.c index a454e246186..144b9f80c4a 100644 --- a/arch/arm/mach-s3c24xx/mach-nexcoder.c +++ b/arch/arm/mach-s3c24xx/mach-nexcoder.c @@ -41,8 +41,6 @@ #include <linux/platform_data/i2c-s3c2410.h> #include <plat/gpio-cfg.h> -#include <plat/s3c2410.h> -#include <plat/s3c244x.h> #include <plat/clock.h> #include <plat/devs.h> #include <plat/cpu.h> |