diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-13 11:30:25 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-13 11:30:25 -0800 |
commit | 90aaa53c5a5af33a061313681d8f3234712b866b (patch) | |
tree | f7d841e7e1aecfb639fedb1bfefeb5f6ba7fa22d /arch/arm/mach-realview/clock.c | |
parent | fix cpumask build breakage on parisc (diff) | |
parent | [ARM] cdb89712: avoid namespace clashes with SRAM_ and BOOTROM_ constants (diff) | |
download | linux-dev-90aaa53c5a5af33a061313681d8f3234712b866b.tar.xz linux-dev-90aaa53c5a5af33a061313681d8f3234712b866b.zip |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] cdb89712: avoid namespace clashes with SRAM_ and BOOTROM_ constants
[ARM] cdb89712,clps7500,h720x: avoid namespace clash for FLASH_* constants
[ARM] integrator,realview,versatile: remove FLASH_* and EPROM_* constants
[ARM] dma-mapping: fix compiler warning
[ARM] iop: iop3xx needs registers mapped uncached+unbuffered
[ARM] versatile: correct MMC clock rate
[ARM] realview: correct MMC clock rate
[ARM] 5329/1: Feroceon: fix feroceon_l2_inv_range
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 = { static struct clk mmci_clk = { .name = "MCLK", - .rate = 33000000, + .rate = 24000000, }; int clk_register(struct clk *clk) |