Fixed mismerge of cpufreq and pcmcia updates

d3dfd13f · Linus Torvalds · c5fc9c4b · d3dfd13f
Commit d3dfd13f authored May 18, 2004 by Linus Torvalds
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

drivers/pcmcia/sa11xx_base.c drivers/pcmcia/sa11xx_base.c +3 -0

No files found.
--- 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;