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 'fbdev-next' of git://github.com/schandinat/linux-2.6
[pandora-kernel.git]
/
drivers
/
video
/
atmel_lcdfb.c
diff --git
a/drivers/video/atmel_lcdfb.c
b/drivers/video/atmel_lcdfb.c
index
244d55b
..
4ac48d9
100644
(file)
--- a/
drivers/video/atmel_lcdfb.c
+++ b/
drivers/video/atmel_lcdfb.c
@@
-21,7
+21,7
@@
#include <mach/board.h>
#include <mach/cpu.h>
-#include <
mach
/gpio.h>
+#include <
asm
/gpio.h>
#include <video/atmel_lcdc.h>