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.17-1.2187_FC5 patched with stable patch-2.6.17.13-vs2...
[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
d2c2ee5
..
aa84f6e
100644
(file)
--- a/
arch/x86_64/kernel/acpi/Makefile
+++ b/
arch/x86_64/kernel/acpi/Makefile
@@
-1,3
+1,9
@@
-obj-
$(CONFIG_ACPI_BOOT)
:= boot.o
-boot-
$(CONFIG_ACPI_BOOT)
:= ../../../i386/kernel/acpi/boot.o
+obj-
y
:= boot.o
+boot-
y
:= ../../../i386/kernel/acpi/boot.o
obj-$(CONFIG_ACPI_SLEEP) += sleep.o wakeup.o
obj-$(CONFIG_ACPI_SLEEP) += sleep.o wakeup.o
+
+ifneq ($(CONFIG_ACPI_PROCESSOR),)
+obj-y += processor.o
+endif
+
+boot-$(CONFIG_XEN) := ../../../i386/kernel/acpi/boot-xen.o