git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge ../linus/
[pandora-kernel.git]
/
arch
/
i386
/
kernel
/
acpi
/
Makefile
diff --git
a/arch/i386/kernel/acpi/Makefile
b/arch/i386/kernel/acpi/Makefile
index
5e291a2
..
267ca48
100644
(file)
--- a/
arch/i386/kernel/acpi/Makefile
+++ b/
arch/i386/kernel/acpi/Makefile
@@
-1,4
+1,4
@@
-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