summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c24xx/mach-bast.c
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-02-05 17:01:56 -0800
committerOlof Johansson <olof@lixom.net>2013-02-05 17:01:56 -0800
commitcf55f672c325f234d96911571a775b2e7d9cf284 (patch)
tree9242f9ddb0f556dca7884c60ad81aefbe35ae258 /arch/arm/mach-s3c24xx/mach-bast.c
parent5060c8881a4b177e27d5bcf351212f2bee125955 (diff)
parent37c3adca81b282bdf310d5ed54acbc28ac0b20a3 (diff)
downloadblackbird-op-linux-cf55f672c325f234d96911571a775b2e7d9cf284.tar.gz
blackbird-op-linux-cf55f672c325f234d96911571a775b2e7d9cf284.zip
Merge branch 'next/cleanup-s3c24xx-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup
From Kukjin Kim: This is 4th cleanup for Samsung S3C24XX stuff, and removes plat-s3c24xx directory. * 'next/cleanup-s3c24xx-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: S3C24XX: header mach/regs-mem.h local ARM: S3C24XX: header mach/regs-power.h local ARM: S3C24XX: header mach/regs-s3c2412-mem.h local ARM: S3C24XX: Remove plat-s3c24xx directory in arch/arm/
Diffstat (limited to 'arch/arm/mach-s3c24xx/mach-bast.c')
-rw-r--r--arch/arm/mach-s3c24xx/mach-bast.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c24xx/mach-bast.c b/arch/arm/mach-s3c24xx/mach-bast.c
index 5c1e3dfb9ab3..ca6618081041 100644
--- a/arch/arm/mach-s3c24xx/mach-bast.c
+++ b/arch/arm/mach-s3c24xx/mach-bast.c
@@ -48,7 +48,6 @@
#include <mach/hardware.h>
#include <mach/regs-gpio.h>
#include <mach/regs-lcd.h>
-#include <mach/regs-mem.h>
#include <plat/clock.h>
#include <plat/cpu.h>
OpenPOWER on IntegriCloud