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 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-s3c64xx
/
mach-mini6410.c
diff --git
a/arch/arm/mach-s3c64xx/mach-mini6410.c
b/arch/arm/mach-s3c64xx/mach-mini6410.c
index
89f35e0
..
527f49b
100644
(file)
--- a/
arch/arm/mach-s3c64xx/mach-mini6410.c
+++ b/
arch/arm/mach-s3c64xx/mach-mini6410.c
@@
-29,7
+29,6
@@
#include <asm/mach/map.h>
#include <mach/map.h>
#include <asm/mach/map.h>
#include <mach/map.h>
-#include <mach/regs-fb.h>
#include <mach/regs-gpio.h>
#include <mach/regs-modem.h>
#include <mach/regs-srom.h>
#include <mach/regs-gpio.h>
#include <mach/regs-modem.h>
#include <mach/regs-srom.h>
@@
-42,6
+41,7
@@
#include <plat/nand.h>
#include <plat/regs-serial.h>
#include <plat/ts.h>
#include <plat/nand.h>
#include <plat/regs-serial.h>
#include <plat/ts.h>
+#include <plat/regs-fb-v4.h>
#include <video/platform_lcd.h>
#include <video/platform_lcd.h>