diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /arch/x86/kernel/cpu/cpufreq/speedstep-smi.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'arch/x86/kernel/cpu/cpufreq/speedstep-smi.c')
| -rw-r--r-- | arch/x86/kernel/cpu/cpufreq/speedstep-smi.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/kernel/cpu/cpufreq/speedstep-smi.c b/arch/x86/kernel/cpu/cpufreq/speedstep-smi.c index befea088e4f5..8abd869baabf 100644 --- a/arch/x86/kernel/cpu/cpufreq/speedstep-smi.c +++ b/arch/x86/kernel/cpu/cpufreq/speedstep-smi.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | #include <linux/moduleparam.h> | 17 | #include <linux/moduleparam.h> |
| 18 | #include <linux/init.h> | 18 | #include <linux/init.h> |
| 19 | #include <linux/cpufreq.h> | 19 | #include <linux/cpufreq.h> |
| 20 | #include <linux/slab.h> | ||
| 21 | #include <linux/delay.h> | 20 | #include <linux/delay.h> |
| 22 | #include <linux/io.h> | 21 | #include <linux/io.h> |
| 23 | #include <asm/ist.h> | 22 | #include <asm/ist.h> |
| @@ -35,7 +34,7 @@ static int smi_cmd; | |||
| 35 | static unsigned int smi_sig; | 34 | static unsigned int smi_sig; |
| 36 | 35 | ||
| 37 | /* info about the processor */ | 36 | /* info about the processor */ |
| 38 | static unsigned int speedstep_processor; | 37 | static enum speedstep_processor speedstep_processor; |
| 39 | 38 | ||
| 40 | /* | 39 | /* |
| 41 | * There are only two frequency states for each processor. Values | 40 | * There are only two frequency states for each processor. Values |