diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-09-27 10:15:47 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-09-27 10:15:47 -0700 |
| commit | b245f26f5e45a6513a318835d83eea895d3ab54b (patch) | |
| tree | ae5cfe08d7152ad28101e642942fc7fb56386322 /arch/arm/mach-omap2/clock2420_data.c | |
| parent | 5a37e7840f445b551b8bdba3b4f10f7ea365dcfc (diff) | |
| parent | 3a63833ec3002816a759a49ebda4e229c089114e (diff) | |
| download | blackbird-op-linux-b245f26f5e45a6513a318835d83eea895d3ab54b.tar.gz blackbird-op-linux-b245f26f5e45a6513a318835d83eea895d3ab54b.zip | |
Merge branch 'devel-omap-misc' into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap2/clock2420_data.c')
| -rw-r--r-- | arch/arm/mach-omap2/clock2420_data.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/clock2420_data.c b/arch/arm/mach-omap2/clock2420_data.c index 37d65d62ed8f..5f2066a6ba74 100644 --- a/arch/arm/mach-omap2/clock2420_data.c +++ b/arch/arm/mach-omap2/clock2420_data.c @@ -1838,7 +1838,7 @@ static struct omap_clk omap2420_clks[] = { CLK(NULL, "des_ick", &des_ick, CK_242X), CLK("omap-sham", "ick", &sha_ick, CK_242X), CLK("omap_rng", "ick", &rng_ick, CK_242X), - CLK(NULL, "aes_ick", &aes_ick, CK_242X), + CLK("omap-aes", "ick", &aes_ick, CK_242X), CLK(NULL, "pka_ick", &pka_ick, CK_242X), CLK(NULL, "usb_fck", &usb_fck, CK_242X), CLK("musb_hdrc", "fck", &osc_ck, CK_242X), |
