summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-05-14 11:43:52 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-05-14 11:43:52 -0700
commit97b2073ff04814a7f2fef5fe0e82bb008cad7d8e (patch)
tree963db446ed9bdb3d1f8b937e87df7580ce7f2341
parent508ff9d41c9aa7e178f6330e703a22af03090dd5 (diff)
parentb9af5ddf8a34ff3c911372173c2e51c6f8a6ca8f (diff)
downloadop-kernel-dev-97b2073ff04814a7f2fef5fe0e82bb008cad7d8e.zip
op-kernel-dev-97b2073ff04814a7f2fef5fe0e82bb008cad7d8e.tar.gz
Merge branch 'davinci-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci
* 'davinci-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci: DA830: fix USB 2.0 clock entry
-rw-r--r--arch/arm/mach-davinci/da830.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-davinci/da830.c b/arch/arm/mach-davinci/da830.c
index 122e61a..e8cb982 100644
--- a/arch/arm/mach-davinci/da830.c
+++ b/arch/arm/mach-davinci/da830.c
@@ -410,7 +410,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),
OpenPOWER on IntegriCloud