diff --git a/[refs] b/[refs]
index 24379466e2f2..d2a931abcebf 100644
--- 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
index 4673517cee71..ed46a1e99c47 100644
--- 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/trunk/arch/arm/plat-omap/include/plat/nokia-dsi-panel.h b/trunk/include/video/omap-panel-nokia-dsi.h
similarity index 81%
rename from trunk/arch/arm/plat-omap/include/plat/nokia-dsi-panel.h
rename to trunk/include/video/omap-panel-nokia-dsi.h
index 4d1e794cf465..e109b21e975a 100644
--- a/trunk/arch/arm/plat-omap/include/plat/nokia-dsi-panel.h
+++ b/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 */