git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
arch
/
x86_64
/
kernel
/
acpi
/
Makefile
diff --git
a/arch/x86_64/kernel/acpi/Makefile
b/arch/x86_64/kernel/acpi/Makefile
index
aa84f6e
..
57b7fe1
100644
(file)
--- a/
arch/x86_64/kernel/acpi/Makefile
+++ b/
arch/x86_64/kernel/acpi/Makefile
@@
-4,6
+4,7
@@
obj-$(CONFIG_ACPI_SLEEP) += sleep.o wakeup.o
ifneq ($(CONFIG_ACPI_PROCESSOR),)
obj-y += processor.o
ifneq ($(CONFIG_ACPI_PROCESSOR),)
obj-y += processor.o
+processor-y := ../../../i386/kernel/acpi/processor.o ../../../i386/kernel/acpi/cstate.o
endif
boot-$(CONFIG_XEN) := ../../../i386/kernel/acpi/boot-xen.o
endif
boot-$(CONFIG_XEN) := ../../../i386/kernel/acpi/boot-xen.o