diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-07-31 20:37:25 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-07-31 20:37:25 -0400 |
| commit | 57cad8084e0837e0f2c97da789ec9b3f36809be9 (patch) | |
| tree | e9c790afb4286f78cb08d9664f58baa7e876fe55 /arch/arm/mach-sa1100/collie.c | |
| parent | cb18bd40030c879cd93fef02fd579f74dbab473d (diff) | |
| parent | 49b1e3ea19b1c95c2f012b8331ffb3b169e4c042 (diff) | |
Merge branch 'merge'
Diffstat (limited to 'arch/arm/mach-sa1100/collie.c')
| -rw-r--r-- | arch/arm/mach-sa1100/collie.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-sa1100/collie.c b/arch/arm/mach-sa1100/collie.c index a6bab50dab61..a0dfa390e34b 100644 --- a/arch/arm/mach-sa1100/collie.c +++ b/arch/arm/mach-sa1100/collie.c | |||
| @@ -83,8 +83,8 @@ static struct scoop_pcmcia_config collie_pcmcia_config = { | |||
| 83 | 83 | ||
| 84 | 84 | ||
| 85 | static struct mcp_plat_data collie_mcp_data = { | 85 | static struct mcp_plat_data collie_mcp_data = { |
| 86 | .mccr0 = MCCR0_ADM, | 86 | .mccr0 = MCCR0_ADM | MCCR0_ExtClk, |
| 87 | .sclk_rate = 11981000, | 87 | .sclk_rate = 9216000, |
| 88 | }; | 88 | }; |
| 89 | 89 | ||
| 90 | #ifdef CONFIG_SHARP_LOCOMO | 90 | #ifdef CONFIG_SHARP_LOCOMO |