git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
arm
/
mach-s3c64xx
/
mach-hmt.c
diff --git
a/arch/arm/mach-s3c64xx/mach-hmt.c
b/arch/arm/mach-s3c64xx/mach-hmt.c
index
b263958
..
b3d93cc
100644
(file)
--- a/
arch/arm/mach-s3c64xx/mach-hmt.c
+++ b/
arch/arm/mach-s3c64xx/mach-hmt.c
@@
-27,7
+27,6
@@
#include <asm/mach/irq.h>
#include <mach/hardware.h>
#include <asm/mach/irq.h>
#include <mach/hardware.h>
-#include <mach/regs-fb.h>
#include <mach/map.h>
#include <asm/irq.h>
#include <mach/map.h>
#include <asm/irq.h>
@@
-42,6
+41,7
@@
#include <plat/clock.h>
#include <plat/devs.h>
#include <plat/cpu.h>
#include <plat/clock.h>
#include <plat/devs.h>
#include <plat/cpu.h>
+#include <plat/regs-fb-v4.h>
#define UCON S3C2410_UCON_DEFAULT
#define ULCON (S3C2410_LCON_CS8 | S3C2410_LCON_PNONE)
#define UCON S3C2410_UCON_DEFAULT
#define ULCON (S3C2410_LCON_CS8 | S3C2410_LCON_PNONE)