diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-08 07:21:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-08 07:21:59 -0700 |
| commit | 6a4b170c54289f427645019c52d1b9c871a6661e (patch) | |
| tree | e129355a1e07a6ee7f24a3df1fdb59906f733bf4 /arch/x86_64/kernel/Makefile | |
| parent | eccdfcd6f8265300380fa14a83aeb14e69830323 (diff) | |
| parent | 64e47488c913ac704d465a6af86a26786d1412a5 (diff) | |
| download | blackbird-op-linux-6a4b170c54289f427645019c52d1b9c871a6661e.tar.gz blackbird-op-linux-6a4b170c54289f427645019c52d1b9c871a6661e.zip | |
Merge branch 'release' of master.kernel.org:/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
Diffstat (limited to 'arch/x86_64/kernel/Makefile')
| -rw-r--r-- | arch/x86_64/kernel/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/Makefile b/arch/x86_64/kernel/Makefile index c32e198d7b2b..1579bdd0adcd 100644 --- a/arch/x86_64/kernel/Makefile +++ b/arch/x86_64/kernel/Makefile @@ -12,7 +12,7 @@ obj-y := process.o signal.o entry.o traps.o irq.o \ obj-$(CONFIG_X86_MCE) += mce.o obj-$(CONFIG_X86_MCE_INTEL) += mce_intel.o obj-$(CONFIG_MTRR) += ../../i386/kernel/cpu/mtrr/ -obj-$(CONFIG_ACPI_BOOT) += acpi/ +obj-$(CONFIG_ACPI) += acpi/ obj-$(CONFIG_X86_MSR) += msr.o obj-$(CONFIG_MICROCODE) += microcode.o obj-$(CONFIG_X86_CPUID) += cpuid.o |
