summaryrefslogtreecommitdiff
path: root/drivers/video/omap/lcd_inn1510.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2009-11-11 05:10:34 +0300
committerTony Lindgren <tony@atomide.com>2009-11-11 05:10:34 +0300
commit774facda20d2f8f0f61fa312d8028dad18ac5ee4 (patch)
treea9068b769fa5956beaabc2445ebe1d575585d7d3 /drivers/video/omap/lcd_inn1510.c
parentb419148e567728f6af0c3b01965c1cc141e3e13a (diff)
parentce491cf85466c3377228c5a852ea627ec5136956 (diff)
downloadlinux-774facda20d2f8f0f61fa312d8028dad18ac5ee4.tar.xz
Merge branch '7xx-iosplit-plat' with omap-fixes
Diffstat (limited to 'drivers/video/omap/lcd_inn1510.c')
-rw-r--r--drivers/video/omap/lcd_inn1510.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/omap/lcd_inn1510.c b/drivers/video/omap/lcd_inn1510.c
index cdbd8bb607be..aafe9b497e2d 100644
--- a/drivers/video/omap/lcd_inn1510.c
+++ b/drivers/video/omap/lcd_inn1510.c
@@ -23,8 +23,8 @@
#include <linux/platform_device.h>
#include <linux/io.h>
-#include <mach/fpga.h>
-#include <mach/omapfb.h>
+#include <plat/fpga.h>
+#include <plat/omapfb.h>
static int innovator1510_panel_init(struct lcd_panel *panel,
struct omapfb_device *fbdev)