[CPUFREQ] Fix up merge conflicts with recent ACPI changes.
[linux-2.6] / include / asm-mips / mach-au1x00 / au1100_mmc.h
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2