Merge branch 'for-paul' of git://gitorious.org/linux-omap-dss2/linux

Conflicts:
	arch/arm/mach-omap2/board-overo.c

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

1 files changed, 4 insertions, 4 deletions

diff --git a/arch/arm/mach-omap2/clock2420_data.c b/arch/arm/mach-omap2/clock2420_data.c
index b6f65d4ac97d..2926d028b6e9 100644
--- a/arch/arm/mach-omap2/clock2420_data.c
+++ b/arch/arm/mach-omap2/clock2420_data.c
@@ -1804,10 +1804,10 @@ static struct omap_clk omap2420_clks[] = {
         CLK(NULL,       "gfx_2d_fck",   &gfx_2d_fck,    CK_242X),
         CLK(NULL,       "gfx_ick",      &gfx_ick,       CK_242X),
         /* DSS domain clocks */
-        CLK("omapdss",  "ick",          &dss_ick,       CK_242X),
-        CLK("omapdss",  "dss1_fck",     &dss1_fck,      CK_242X),
-        CLK("omapdss",  "dss2_fck",     &dss2_fck,      CK_242X),
-        CLK("omapdss",  "tv_fck",       &dss_54m_fck,   CK_242X),
+        CLK("omapdss_dss",      "ick",          &dss_ick,       CK_242X),
+        CLK("omapdss_dss",      "fck",          &dss1_fck,      CK_242X),
+        CLK("omapdss_dss",      "sys_clk",      &dss2_fck,      CK_242X),
+        CLK("omapdss_dss",      "tv_clk",       &dss_54m_fck,   CK_242X),
         /* L3 domain clocks */
         CLK(NULL,       "core_l3_ck",   &core_l3_ck,    CK_242X),
         CLK(NULL,       "ssi_fck",      &ssi_ssr_sst_fck, CK_242X),