diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-26 17:20:38 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-26 17:20:38 +0200 |
| commit | 6aa033d7efb85830535bb83cf6713d6025ae6e59 (patch) | |
| tree | 27a4566bc87fc6d34a78f582531cdbe0bd7018ca /drivers/pcmcia | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmo... (diff) | |
| parent | ARM: 6265/1: kirkwood: move qnap_tsx1x_register_flash() to .init.text (diff) | |
| download | linux-6aa033d7efb85830535bb83cf6713d6025ae6e59.tar.xz linux-6aa033d7efb85830535bb83cf6713d6025ae6e59.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
ARM: 6265/1: kirkwood: move qnap_tsx1x_register_flash() to .init.text
ARM: 6263/1: ns9xxx: fix FTBFS for zImage
ARM: 6262/1: arm/clps711x: fix debug macro compilation failure
ARM: 6261/1: arm/shark: fix debug macro compilation failure
ARM: 6260/1: arm/plat-spear: fix debug macro compilation failure
ARM: 6259/1: arm/ns9xxx: fix debug macro compilation failure
ARM: 6258/1: arm/h720x: fix debug macro compilation failure
ARM: 6233/1: Delete a wrong redundant right parenthesis
ARM: 6230/1: fix nuc900 touchscreen clk definition bug
[ARM] pxa: fix incorrect CONFIG_CPU_PXA27x to CONFIG_PXA27x
[ARM] pxa/colibri-pxa300: fix AC97 init
[ARM] pxa: fix incorrect order of AC97 reset pin configs
[ARM] pxa: fix frequency scaling for pcmcia/pxa2xx_base
[ARM] pxa: cpufreq-pxa2xx: fix DRI recomputation routine
[ARM] pxa/corgi: fix MMC/SD card detection failure
Diffstat (limited to 'drivers/pcmcia')
| -rw-r--r-- | drivers/pcmcia/pxa2xx_base.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/pcmcia/pxa2xx_base.c b/drivers/pcmcia/pxa2xx_base.c index df4532e91b1a..f370476d5417 100644 --- a/drivers/pcmcia/pxa2xx_base.c +++ b/drivers/pcmcia/pxa2xx_base.c @@ -178,7 +178,6 @@ pxa2xx_pcmcia_frequency_change(struct soc_pcmcia_socket *skt, unsigned long val, struct cpufreq_freqs *freqs) { -#warning "it's not clear if this is right since the core CPU (N) clock has no effect on the memory (L) clock" switch (val) { case CPUFREQ_PRECHANGE: if (freqs->new > freqs->old) { @@ -186,7 +185,7 @@ pxa2xx_pcmcia_frequency_change(struct soc_pcmcia_socket *skt, "pre-updating\n", freqs->new / 1000, (freqs->new / 100) % 10, freqs->old / 1000, (freqs->old / 100) % 10); - pxa2xx_pcmcia_set_mcxx(skt, freqs->new); + pxa2xx_pcmcia_set_timing(skt); } break; @@ -196,7 +195,7 @@ pxa2xx_pcmcia_frequency_change(struct soc_pcmcia_socket *skt, "post-updating\n", freqs->new / 1000, (freqs->new / 100) % 10, freqs->old / 1000, (freqs->old / 100) % 10); - pxa2xx_pcmcia_set_mcxx(skt, freqs->new); + pxa2xx_pcmcia_set_timing(skt); } break; } |