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 'tracing/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/frederi...
[pandora-kernel.git]
/
drivers
/
video
/
epson1355fb.c
diff --git
a/drivers/video/epson1355fb.c
b/drivers/video/epson1355fb.c
index
cc2810e
..
2735b79
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