diff options
author | David S. Miller <davem@davemloft.net> | 2009-12-12 04:12:17 +0300 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-12-12 04:12:17 +0300 |
commit | 501706565b2d4d2d40d0d301d5411ede099b8a6f (patch) | |
tree | 142a18bf1f1e74a09dbfa27540b893ade0fd797d /drivers/video/omap/lcd_2430sdp.c | |
parent | e93737b0f0159a61772894943199fd3b6f315641 (diff) | |
parent | 2fe77b81c77eed92c4c0439f74c8148a295b4a86 (diff) | |
download | linux-501706565b2d4d2d40d0d301d5411ede099b8a6f.tar.xz |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
include/net/tcp.h
Diffstat (limited to 'drivers/video/omap/lcd_2430sdp.c')
-rw-r--r-- | drivers/video/omap/lcd_2430sdp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/omap/lcd_2430sdp.c b/drivers/video/omap/lcd_2430sdp.c index fea7feee0b77..760645d9dbb6 100644 --- a/drivers/video/omap/lcd_2430sdp.c +++ b/drivers/video/omap/lcd_2430sdp.c @@ -28,9 +28,10 @@ #include <linux/i2c/twl4030.h> #include <plat/mux.h> -#include <plat/omapfb.h> #include <asm/mach-types.h> +#include "omapfb.h" + #define SDP2430_LCD_PANEL_BACKLIGHT_GPIO 91 #define SDP2430_LCD_PANEL_ENABLE_GPIO 154 #define SDP3430_LCD_PANEL_BACKLIGHT_GPIO 24 |