projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'fixes-for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm...
[firefly-linux-kernel-4.4.55.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 d6266d8b43c91c049d2961e24dbdfd2b9ba7feac..96d6da2b6b5fc399d54f5d68449a423a913330b3 100644
(file)
--- a/
arch/arm/mach-s3c64xx/mach-smartq5.c
+++ b/
arch/arm/mach-s3c64xx/mach-smartq5.c
@@
-21,6
+21,7
@@
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
+#include <video/samsung_fimd.h>
#include <mach/map.h>
#include <mach/regs-gpio.h>
#include <mach/map.h>
#include <mach/regs-gpio.h>
@@
-28,7
+29,6
@@
#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 "common.h"
#include "mach-smartq.h"
#include "common.h"
#include "mach-smartq.h"