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 'at91/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...
[pandora-kernel.git]
/
arch
/
arm
/
mach-s3c64xx
/
mach-smartq5.c
diff --git
a/arch/arm/mach-s3c64xx/mach-smartq5.c
b/arch/arm/mach-s3c64xx/mach-smartq5.c
index
3a3e5ac
..
342e8df
100644
(file)
--- a/
arch/arm/mach-s3c64xx/mach-smartq5.c
+++ b/
arch/arm/mach-s3c64xx/mach-smartq5.c
@@
-21,7
+21,6
@@
#include <asm/mach/arch.h>
#include <mach/map.h>
#include <asm/mach/arch.h>
#include <mach/map.h>
-#include <mach/regs-fb.h>
#include <mach/regs-gpio.h>
#include <mach/s3c6410.h>
#include <mach/regs-gpio.h>
#include <mach/s3c6410.h>
@@
-29,6
+28,7
@@
#include <plat/devs.h>
#include <plat/fb.h>
#include <plat/gpio-cfg.h>
#include <plat/devs.h>
#include <plat/fb.h>
#include <plat/gpio-cfg.h>
+#include <plat/regs-fb-v4.h>
#include "mach-smartq.h"
#include "mach-smartq.h"