Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 295741
b: refs/heads/master
c: d3e8b75
h: refs/heads/master
i:
  295739: 58b2630
v: v3
  • Loading branch information
Linus Walleij committed Jan 30, 2012
1 parent cc304ed commit dd23210
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b9576623c4217a5d753c272158e1e108c25a1a57
refs/heads/master: d3e8b7569ad733c063a95dc1a51928e6e7c40652
4 changes: 2 additions & 2 deletions trunk/arch/arm/plat-nomadik/timer.c
Original file line number Diff line number Diff line change
Expand Up @@ -190,8 +190,8 @@ void __init nmdk_timer_init(void __iomem *base)
mtu_base = base;
clk0 = clk_get_sys("mtu0", NULL);
BUG_ON(IS_ERR(clk0));

clk_enable(clk0);
BUG_ON(clk_prepare(clk0) < 0);
BUG_ON(clk_enable(clk0) < 0);

/*
* Tick rate is 2.4MHz for Nomadik and 2.4Mhz, 100MHz or 133 MHz
Expand Down

0 comments on commit dd23210

Please sign in to comment.