diff --git a/[refs] b/[refs]
index db0bc4530e84..c792f872f3fe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 60634a28bc5467ade316574c4aa728c5bff7947e
+refs/heads/master: d875f992e9d0b1473ff98845cb3c2a45dcf6aa0f
diff --git a/trunk/drivers/video/omap2/dss/Makefile b/trunk/drivers/video/omap2/dss/Makefile
index 962782927243..bd34ac5b2026 100644
--- a/trunk/drivers/video/omap2/dss/Makefile
+++ b/trunk/drivers/video/omap2/dss/Makefile
@@ -6,4 +6,4 @@ omapdss-$(CONFIG_OMAP2_DSS_VENC) += venc.o
 omapdss-$(CONFIG_OMAP2_DSS_SDI) += sdi.o
 omapdss-$(CONFIG_OMAP2_DSS_DSI) += dsi.o
 omapdss-$(CONFIG_OMAP4_DSS_HDMI) += hdmi.o \
-				    hdmi_omap4_panel.o ti_hdmi_4xxx_ip.o
+				    hdmi_panel.o ti_hdmi_4xxx_ip.o
diff --git a/trunk/drivers/video/omap2/dss/hdmi_omap4_panel.c b/trunk/drivers/video/omap2/dss/hdmi_panel.c
similarity index 99%
rename from trunk/drivers/video/omap2/dss/hdmi_omap4_panel.c
rename to trunk/drivers/video/omap2/dss/hdmi_panel.c
index 7d4f2bd7c506..e30182f5fecf 100644
--- a/trunk/drivers/video/omap2/dss/hdmi_omap4_panel.c
+++ b/trunk/drivers/video/omap2/dss/hdmi_panel.c
@@ -1,5 +1,5 @@
 /*
- * hdmi_omap4_panel.c
+ * hdmi_panel.c
  *
  * HDMI library support functions for TI OMAP4 processors.
  *