diff options
| author | Paul Mundt | 2011-03-22 06:27:36 +0100 |
|---|---|---|
| committer | Paul Mundt | 2011-03-22 06:27:36 +0100 |
| commit | da49252fb0392d8196833ef3da92e48fb371f8d7 (patch) | |
| tree | 1299899f7513a900b2229b8cde289bca8c41d2f5 /arch/arm/mach-omap2/clock2420_data.c | |
| parent | Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek... (diff) | |
| parent | OMAP4: PandaBoard: Adding DVI support (diff) | |
| download | kernel-qcow2-linux-da49252fb0392d8196833ef3da92e48fb371f8d7.tar.gz kernel-qcow2-linux-da49252fb0392d8196833ef3da92e48fb371f8d7.tar.xz kernel-qcow2-linux-da49252fb0392d8196833ef3da92e48fb371f8d7.zip | |
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>
Diffstat (limited to 'arch/arm/mach-omap2/clock2420_data.c')
| -rw-r--r-- | arch/arm/mach-omap2/clock2420_data.c | 8 |
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), |