Merge tag 'for-linus-docs-2012-05-02' of git://git.kernel.org/pub/scm/linux/kernel...

[deliverable/linux.git] / arch / arm / mach-omap2 / cclock2430_data.c

diff --git a/arch/arm/mach-omap2/cclock2430_data.c b/arch/arm/mach-omap2/cclock2430_data.c
index bda353b2f7d929d58351f50967e1a02e7ce1a66b..5e4b037bb24cb66236c9f0bfe502d6b844e7d11e 100644 (file)
--- a/arch/arm/mach-omap2/cclock2430_data.c
+++ b/arch/arm/mach-omap2/cclock2430_data.c
@@ -1978,9 +1978,11 @@ static struct omap_clk omap2430_clks[] = {
        CLK(NULL,       "sdrc_ick",     &sdrc_ick),
        CLK(NULL,       "des_ick",      &des_ick),
        CLK("omap-sham",        "ick",  &sha_ick),
-       CLK("omap_rng", "ick",          &rng_ick),
+       CLK(NULL,       "sha_ick",      &sha_ick),
+       CLK("omap_rng", "ick",          &rng_ick),
        CLK(NULL,       "rng_ick",      &rng_ick),
        CLK("omap-aes", "ick",  &aes_ick),
+       CLK(NULL,       "aes_ick",      &aes_ick),
        CLK(NULL,       "pka_ick",      &pka_ick),
        CLK(NULL,       "usb_fck",      &usb_fck),
        CLK("musb-omap2430",    "ick",  &usbhs_ick),