[CPUFREQ] Move MSRs from powernow-k7.h to include/asm-i386/msr.h

4c752fff · Dave Jones · Dave Jones · ca11b0a7 · 4c752fff · 4c752fff
Commit 4c752fff authored Jul 15, 2003 by Dave Jones Committed by Dave Jones Jul 15, 2003
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 9 deletions

arch/i386/kernel/cpu/cpufreq/powernow-k7.h arch/i386/kernel/cpu/cpufreq/powernow-k7.h +0 -8

include/asm-i386/msr.h include/asm-i386/msr.h +1 -1

No files found.
--- a/arch/i386/kernel/cpu/cpufreq/powernow-k7.h
+++ b/arch/i386/kernel/cpu/cpufreq/powernow-k7.h
@@ -8,14 +8,6 @@
 *
 */

-#ifndef MSR_K7_FID_VID_CTL
-#define MSR_K7_FID_VID_CTL		0xc0010041
-#endif
-#ifndef MSR_K7_FID_VID_STATUS
-#define MSR_K7_FID_VID_STATUS	0xc0010042
-#endif
-
-
 union msr_fidvidctl {
 	struct {
 		unsigned FID:5,			// 4:0

--- a/include/asm-i386/msr.h
+++ b/include/asm-i386/msr.h
@@ -200,7 +200,7 @@
 #define MSR_K7_HWCR			0xC0010015
 #define MSR_K7_CLK_CTL			0xC001001b
 #define MSR_K7_FID_VID_CTL		0xC0010041
-#define MSR_K7_VID_STATUS		0xC0010042
+#define MSR_K7_FID_VID_STATUS		0xC0010042

 /* Centaur-Hauls/IDT defined MSRs. */
 #define MSR_IDT_FCR1			0x107