---

yaml --- r: 251006 b: refs/heads/master c: 4e9f99d h: refs/heads/master v: v3
git-mirror · May 11, 2011 · 6b1d0dd · 6b1d0dd
1 parent 38ec5ad
commit 6b1d0dd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f8ae2f08d2c4574ca5c3923d2463ef106b116c2a
+refs/heads/master: 4e9f99d75cc6979b92d03ff9ae129c652c00a8d3
diff --git a/trunk/drivers/video/omap2/displays/panel-taal.c b/trunk/drivers/video/omap2/displays/panel-taal.c
@@ -34,7 +34,7 @@
 #include <linux/mutex.h>
 
 #include <video/omapdss.h>
-#include <plat/nokia-dsi-panel.h>
+#include <video/omap-panel-nokia-dsi.h>
 
 /* DSI Virtual channel. Hardcoded for now. */
 #define TCH 0

diff --git a/.../plat-omap/include/plat/nokia-dsi-panel.h → trunk/include/video/omap-panel-nokia-dsi.h b/.../plat-omap/include/plat/nokia-dsi-panel.h → trunk/include/video/omap-panel-nokia-dsi.h
@@ -1,5 +1,5 @@
-#ifndef __ARCH_ARM_PLAT_OMAP_NOKIA_DSI_PANEL_H
-#define __ARCH_ARM_PLAT_OMAP_NOKIA_DSI_PANEL_H
+#ifndef __OMAP_NOKIA_DSI_PANEL_H
+#define __OMAP_NOKIA_DSI_PANEL_H
 
 struct omap_dss_device;
 
@@ -28,4 +28,4 @@ struct nokia_dsi_panel_data {
 	int (*get_backlight)(struct omap_dss_device *dssdev);
 };
 
-#endif /* __ARCH_ARM_PLAT_OMAP_NOKIA_DSI_PANEL_H */
+#endif /* __OMAP_NOKIA_DSI_PANEL_H */