projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge linux-2.6 with linux-acpi-2.6
[firefly-linux-kernel-4.4.55.git]
/
arch
/
i386
/
kernel
/
Makefile
diff --git
a/arch/i386/kernel/Makefile
b/arch/i386/kernel/Makefile
index 64682a0edacf5c54490fe5928c1ce716f82be522..f10de0f2c5e622258517b978afac886378a04333 100644
(file)
--- a/
arch/i386/kernel/Makefile
+++ b/
arch/i386/kernel/Makefile
@@
-11,7
+11,7
@@
obj-y := process.o semaphore.o signal.o entry.o traps.o irq.o vm86.o \
obj-y += cpu/
obj-y += timers/
-obj-$(CONFIG_ACPI
_BOOT)
+= acpi/
+obj-$(CONFIG_ACPI
)
+= acpi/
obj-$(CONFIG_X86_BIOS_REBOOT) += reboot.o
obj-$(CONFIG_MCA) += mca.o
obj-$(CONFIG_X86_MSR) += msr.o