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 commit 'gcl/merge' into next
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
video
/
epson1355fb.c
diff --git
a/drivers/video/epson1355fb.c
b/drivers/video/epson1355fb.c
index cc2810ef5de5d8467ac30566448454d0cdd5598e..2735b79e52a1d52bfc2035d0ca1c514d939dda78 100644
(file)
--- a/
drivers/video/epson1355fb.c
+++ b/
drivers/video/epson1355fb.c
@@
-71,7
+71,7
@@
struct epson1355_par {
#if defined(CONFIG_ARM)
# ifdef CONFIG_ARCH_CEIVA
-# include <
asm/ar
ch/hardware.h>
+# include <
ma
ch/hardware.h>
# define EPSON1355FB_BASE_PHYS (CEIVA_PHYS_SED1355)
# endif