diff options
author | Tony Lindgren <tony@atomide.com> | 2009-11-22 13:08:43 -0500 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2009-11-22 13:08:43 -0500 |
commit | a76df42a675c9936e8bf3607226e74c8a5e2d847 (patch) | |
tree | 96d93706d884dea956393653452fa4d78d8d7f76 /drivers/video/omap/lcd_2430sdp.c | |
parent | 648f4e3e50c4793d9dbf9a09afa193631f76fa26 (diff) | |
parent | 8171d88089ad63fc442b2bf32af7c18653adc5cb (diff) |
Merge 7xx-iosplit-plat-merge with omap-fixes
Merge branch '7xx-iosplit-plat-merge' into omap-for-linus
Diffstat (limited to 'drivers/video/omap/lcd_2430sdp.c')
-rw-r--r-- | drivers/video/omap/lcd_2430sdp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/omap/lcd_2430sdp.c b/drivers/video/omap/lcd_2430sdp.c index 393712b6f369..fea7feee0b77 100644 --- a/drivers/video/omap/lcd_2430sdp.c +++ b/drivers/video/omap/lcd_2430sdp.c | |||
@@ -27,8 +27,8 @@ | |||
27 | #include <linux/gpio.h> | 27 | #include <linux/gpio.h> |
28 | #include <linux/i2c/twl4030.h> | 28 | #include <linux/i2c/twl4030.h> |
29 | 29 | ||
30 | #include <mach/mux.h> | 30 | #include <plat/mux.h> |
31 | #include <mach/omapfb.h> | 31 | #include <plat/omapfb.h> |
32 | #include <asm/mach-types.h> | 32 | #include <asm/mach-types.h> |
33 | 33 | ||
34 | #define SDP2430_LCD_PANEL_BACKLIGHT_GPIO 91 | 34 | #define SDP2430_LCD_PANEL_BACKLIGHT_GPIO 91 |