diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-02-28 15:54:19 -0500 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-02-28 15:54:19 -0500 |
| commit | 9a577aa8d55f8607e6f5ea6fb9d52780930d8373 (patch) | |
| tree | c75d2b89c0affd199e0af35e86d8e664fdd34c32 /arch/arm/mach-omap2/clock2430_data.c | |
| parent | 3b99255148bd5a40586944d0110f741c41db5f43 (diff) | |
| parent | 82544ce706497e311e4d0852f221ef9c0cd897d1 (diff) | |
Merge branch 'omap4_mpu_dvfs' into linaro-2.6.38
Diffstat (limited to 'arch/arm/mach-omap2/clock2430_data.c')
| -rw-r--r-- | arch/arm/mach-omap2/clock2430_data.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/clock2430_data.c b/arch/arm/mach-omap2/clock2430_data.c index 136171c92c6..c698c1c8778 100644 --- a/arch/arm/mach-omap2/clock2430_data.c +++ b/arch/arm/mach-omap2/clock2430_data.c @@ -1903,6 +1903,7 @@ static struct omap_clk omap2430_clks[] = { CLK(NULL, "ssi_l4_ick", &ssi_l4_ick, CK_243X), /* virtual meta-group clock */ CLK(NULL, "virt_prcm_set", &virt_prcm_set, CK_243X), + CLK(NULL, "cpu_ck", &virt_prcm_set, CK_243X), /* general l4 interface ck, multi-parent functional clk */ CLK(NULL, "gpt1_ick", &gpt1_ick, CK_243X), CLK(NULL, "gpt1_fck", &gpt1_fck, CK_243X), |