diff options
| author | David S. Miller <davem@davemloft.net> | 2008-11-19 02:38:23 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-19 02:38:23 -0500 |
| commit | 198d6ba4d7f48c94f990f4604f0b3d73925e0ded (patch) | |
| tree | 56bbdf8ba2553c23c8099da9344a8f1d1aba97ab /arch/arm/mach-realview/clock.c | |
| parent | 9a57f7fabd383920585ed8b74eacd117c6551f2d (diff) | |
| parent | 7f0f598a0069d1ab072375965a4b69137233169c (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/isdn/i4l/isdn_net.c
fs/cifs/connect.c
Diffstat (limited to 'arch/arm/mach-realview/clock.c')
| -rw-r--r-- | arch/arm/mach-realview/clock.c | 2 |
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 | ||
| 105 | static struct clk mmci_clk = { | 105 | static struct clk mmci_clk = { |
| 106 | .name = "MCLK", | 106 | .name = "MCLK", |
| 107 | .rate = 33000000, | 107 | .rate = 24000000, |
| 108 | }; | 108 | }; |
| 109 | 109 | ||
| 110 | int clk_register(struct clk *clk) | 110 | int clk_register(struct clk *clk) |