diff options
| author | Kevin Hilman <khilman@deeprootsystems.com> | 2010-05-14 11:27:35 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@deeprootsystems.com> | 2010-05-14 11:27:35 -0700 |
| commit | 5954dd1d2cab4b378e22256edbfe132bf4f82f22 (patch) | |
| tree | b7d599e11442891b0d80ca2acfbf34b8cffbbb7f | |
| parent | 8c313029b9848f430af667f2ed4d8bc657e3044e (diff) | |
| parent | b9af5ddf8a34ff3c911372173c2e51c6f8a6ca8f (diff) | |
Merge branch 'davinci-fixes' into new-master
| -rw-r--r-- | arch/arm/mach-davinci/da830.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-davinci/da830.c b/arch/arm/mach-davinci/da830.c index 3a7a96fe7b84..23e9eda5a377 100644 --- a/arch/arm/mach-davinci/da830.c +++ b/arch/arm/mach-davinci/da830.c @@ -411,7 +411,7 @@ static struct clk_lookup da830_clks[] = { CLK("davinci-mcasp.0", NULL, &mcasp0_clk), CLK("davinci-mcasp.1", NULL, &mcasp1_clk), CLK("davinci-mcasp.2", NULL, &mcasp2_clk), - CLK("musb_hdrc", NULL, &usb20_clk), + CLK(NULL, "usb20", &usb20_clk), CLK(NULL, "aemif", &aemif_clk), CLK(NULL, "aintc", &aintc_clk), CLK(NULL, "secu_mgr", &secu_mgr_clk), |