projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
[linux-2.6-block.git]
/
drivers
/
video
/
omap
/
lcd_ams_delta.c
diff --git
a/drivers/video/omap/lcd_ams_delta.c
b/drivers/video/omap/lcd_ams_delta.c
index 319a9a2bc236ea042d8c8d992558ab2622e74074..b3973ebd1b0f4aabc229caa5aeeaa632b324e852 100644
(file)
--- a/
drivers/video/omap/lcd_ams_delta.c
+++ b/
drivers/video/omap/lcd_ams_delta.c
@@
-25,9
+25,9
@@
#include <linux/io.h>
#include <linux/delay.h>
-#include <
mach
/board-ams-delta.h>
+#include <
plat
/board-ams-delta.h>
#include <mach/hardware.h>
-#include <
mach
/omapfb.h>
+#include <
plat
/omapfb.h>
#define AMS_DELTA_DEFAULT_CONTRAST 112