aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-realview/clock.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-12-04 02:52:14 -0500
committerIngo Molnar <mingo@elte.hu>2008-12-04 02:52:14 -0500
commitcb9c34e6d090d376b77becaa5d29a65dec7f4272 (patch)
tree3678abce20d6825aebe3fec218057d4131e13fd6 /arch/arm/mach-realview/clock.c
parent470c66239ef0336429b35345f3f615d47341e13b (diff)
parent061e41fdb5047b1fb161e89664057835935ca1d2 (diff)
Merge commit 'v2.6.28-rc7' into core/locking
Diffstat (limited to 'arch/arm/mach-realview/clock.c')
-rw-r--r--arch/arm/mach-realview/clock.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-realview/clock.c b/arch/arm/mach-realview/clock.c
index 3e706c57833a..3347c4236a60 100644
--- a/arch/arm/mach-realview/clock.c
+++ b/arch/arm/mach-realview/clock.c
@@ -104,7 +104,7 @@ static struct clk uart_clk = {
104 104
105static struct clk mmci_clk = { 105static struct clk mmci_clk = {
106 .name = "MCLK", 106 .name = "MCLK",
107 .rate = 33000000, 107 .rate = 24000000,
108}; 108};
109 109
110int clk_register(struct clk *clk) 110int clk_register(struct clk *clk)