projects
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master'
[linux-2.6]
/
arch
/
i386
/
kernel
/
acpi
/
Makefile
diff --git
a/arch/i386/kernel/acpi/Makefile
b/arch/i386/kernel/acpi/Makefile
index
5e291a2
..
d51c731
100644
(file)
--- a/
arch/i386/kernel/acpi/Makefile
+++ b/
arch/i386/kernel/acpi/Makefile
@@
-1,8
+1,8
@@
-obj-
$(CONFIG_ACPI_BOOT)
:= boot.o
+obj-
y
:= boot.o
obj-$(CONFIG_X86_IO_APIC) += earlyquirk.o
obj-$(CONFIG_ACPI_SLEEP) += sleep.o wakeup.o
ifneq ($(CONFIG_ACPI_PROCESSOR),)
-obj-y += cstate.o
+obj-y += cstate.o
processor.o
endif