diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-26 17:17:50 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-26 17:17:50 -0500 |
commit | 6f8c480f998a619082f18407f8d7f4c29e94dc6e (patch) | |
tree | 5047fe0d685fe9eab64c506fa1001e7df5e65faa /arch/x86_64/lib/Makefile | |
parent | 038c068f63a950c3a6ccfa814831ccac0ad48fb1 (diff) | |
parent | bd5ab26a7d0cc834d846fe5dd7291f0aed3be72b (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq
* master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq:
[CPUFREQ] constify some data tables.
[CPUFREQ] constify cpufreq_driver where possible.
{rd,wr}msr_on_cpu SMP=n optimization
[CPUFREQ] cpufreq_ondemand.c: don't use _WORK_NAR
rdmsr_on_cpu, wrmsr_on_cpu
[CPUFREQ] Revert default on deprecated config X86_SPEEDSTEP_CENTRINO_ACPI
Diffstat (limited to 'arch/x86_64/lib/Makefile')
-rw-r--r-- | arch/x86_64/lib/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86_64/lib/Makefile b/arch/x86_64/lib/Makefile index 8d5f835af481..c94327178398 100644 --- a/arch/x86_64/lib/Makefile +++ b/arch/x86_64/lib/Makefile | |||
@@ -5,6 +5,7 @@ | |||
5 | CFLAGS_csum-partial.o := -funroll-loops | 5 | CFLAGS_csum-partial.o := -funroll-loops |
6 | 6 | ||
7 | obj-y := io.o iomap_copy.o | 7 | obj-y := io.o iomap_copy.o |
8 | obj-$(CONFIG_SMP) += msr-on-cpu.o | ||
8 | 9 | ||
9 | lib-y := csum-partial.o csum-copy.o csum-wrappers.o delay.o \ | 10 | lib-y := csum-partial.o csum-copy.o csum-wrappers.o delay.o \ |
10 | usercopy.o getuser.o putuser.o \ | 11 | usercopy.o getuser.o putuser.o \ |