diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/video/omap/lcd_overo.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/video/omap/lcd_overo.c')
| -rw-r--r-- | drivers/video/omap/lcd_overo.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/video/omap/lcd_overo.c b/drivers/video/omap/lcd_overo.c index 2bc5c9268e5e..564933ffac6e 100644 --- a/drivers/video/omap/lcd_overo.c +++ b/drivers/video/omap/lcd_overo.c | |||
| @@ -21,13 +21,14 @@ | |||
| 21 | 21 | ||
| 22 | #include <linux/module.h> | 22 | #include <linux/module.h> |
| 23 | #include <linux/platform_device.h> | 23 | #include <linux/platform_device.h> |
| 24 | #include <linux/i2c/twl4030.h> | 24 | #include <linux/i2c/twl.h> |
| 25 | 25 | ||
| 26 | #include <mach/gpio.h> | 26 | #include <mach/gpio.h> |
| 27 | #include <mach/mux.h> | 27 | #include <plat/mux.h> |
| 28 | #include <mach/omapfb.h> | ||
| 29 | #include <asm/mach-types.h> | 28 | #include <asm/mach-types.h> |
| 30 | 29 | ||
| 30 | #include "omapfb.h" | ||
| 31 | |||
| 31 | #define LCD_ENABLE 144 | 32 | #define LCD_ENABLE 144 |
| 32 | 33 | ||
| 33 | static int overo_panel_init(struct lcd_panel *panel, | 34 | static int overo_panel_init(struct lcd_panel *panel, |