diff options
| author | Dave Jones <davej@redhat.com> | 2006-12-12 17:41:41 -0500 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-12-12 17:41:41 -0500 |
| commit | c4366889dda8110247be59ca41fddb82951a8c26 (patch) | |
| tree | 705c1a996bed8fd48ce94ff33ec9fd00f9b94875 /arch/i386/kernel/cpu/mtrr/Makefile | |
| parent | db2fb9db5735cc532fd4fc55e94b9a3c3750378e (diff) | |
| parent | e1036502e5263851259d147771226161e5ccc85a (diff) | |
Merge ../linus
Conflicts:
drivers/cpufreq/cpufreq.c
Diffstat (limited to 'arch/i386/kernel/cpu/mtrr/Makefile')
| -rw-r--r-- | arch/i386/kernel/cpu/mtrr/Makefile | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/i386/kernel/cpu/mtrr/Makefile b/arch/i386/kernel/cpu/mtrr/Makefile index a25b701ab84e..191fc0533649 100644 --- a/arch/i386/kernel/cpu/mtrr/Makefile +++ b/arch/i386/kernel/cpu/mtrr/Makefile | |||
| @@ -1,5 +1,3 @@ | |||
| 1 | obj-y := main.o if.o generic.o state.o | 1 | obj-y := main.o if.o generic.o state.o |
| 2 | obj-y += amd.o | 2 | obj-$(CONFIG_X86_32) += amd.o cyrix.o centaur.o |
| 3 | obj-y += cyrix.o | ||
| 4 | obj-y += centaur.o | ||
| 5 | 3 | ||