diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-01 22:06:15 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-01 22:06:15 -0800 |
commit | 59ed2f59e4ea6a32f9591e378da7935f713a7000 (patch) | |
tree | a1276a611dbb1bc44685ef8af363e99603e60047 /arch/x86_64/kernel/acpi/Makefile | |
parent | 9ad11ab48b1ad618bf47076e9e579f267f5306c2 (diff) | |
parent | b8e4d89357fc434618a59c1047cac72641191805 (diff) | |
download | kernel-crypto-59ed2f59e4ea6a32f9591e378da7935f713a7000.tar.gz kernel-crypto-59ed2f59e4ea6a32f9591e378da7935f713a7000.tar.xz kernel-crypto-59ed2f59e4ea6a32f9591e378da7935f713a7000.zip |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
Diffstat (limited to 'arch/x86_64/kernel/acpi/Makefile')
-rw-r--r-- | arch/x86_64/kernel/acpi/Makefile | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/x86_64/kernel/acpi/Makefile b/arch/x86_64/kernel/acpi/Makefile index 7da9ace890b..4fe97071f29 100644 --- a/arch/x86_64/kernel/acpi/Makefile +++ b/arch/x86_64/kernel/acpi/Makefile @@ -1,3 +1,8 @@ obj-y := boot.o boot-y := ../../../i386/kernel/acpi/boot.o obj-$(CONFIG_ACPI_SLEEP) += sleep.o wakeup.o + +ifneq ($(CONFIG_ACPI_PROCESSOR),) +obj-y += processor.o +endif + |