Fixed mismerge of cpufreq and pcmcia updates

diff --git a/drivers/pcmcia/sa11xx_base.c b/drivers/pcmcia/sa11xx_base.c
index e94e389d4833726df672357b21f1b4569ca636bd..4e28450b1367347efba1a16c5add03a4a1bb1d49 100644 (file)
--- a/drivers/pcmcia/sa11xx_base.c
+++ b/drivers/pcmcia/sa11xx_base.c
@@ -219,6 +219,9 @@ sa1100_pcmcia_notifier(struct notifier_block *nb, unsigned long val,
                if (freqs->new < freqs->old)
                        sa1100_pcmcia_update_mecr(freqs->new);
                break;
+       case CPUFREQ_RESUMECHANGE:
+               sa1100_pcmcia_update_mecr(freqs->new);
+               break;
        }
 
        return 0;