diff options
author | Paul Mundt <lethal@linux-sh.org> | 2009-12-15 12:10:10 +0900 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-12-15 12:10:10 +0900 |
commit | e0aa51f54faa0659b529143de6c608e76675326f (patch) | |
tree | 22fc566b74bfe6bd612a858ba354818900cdc394 /drivers/video/omap/lcd_osk.c | |
parent | 9f815a1765b0ce766ab1d26ef192d30410f70b2b (diff) | |
parent | 3ea6b3d0e6d0ffd91c0f8cadeb69b7133c038b32 (diff) | |
download | talos-op-linux-e0aa51f54faa0659b529143de6c608e76675326f.tar.gz talos-op-linux-e0aa51f54faa0659b529143de6c608e76675326f.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/video/omap/lcd_osk.c')
-rw-r--r-- | drivers/video/omap/lcd_osk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/omap/lcd_osk.c b/drivers/video/omap/lcd_osk.c index bb21d7dca39e..b87e8b83f29c 100644 --- a/drivers/video/omap/lcd_osk.c +++ b/drivers/video/omap/lcd_osk.c @@ -25,7 +25,7 @@ #include <mach/gpio.h> #include <plat/mux.h> -#include <plat/omapfb.h> +#include "omapfb.h" static int osk_panel_init(struct lcd_panel *panel, struct omapfb_device *fbdev) { |