OSDN Git Service
(root)
/
sagit-ice-cold
/
kernel_xiaomi_msm8998.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64...
[sagit-ice-cold/kernel_xiaomi_msm8998.git]
/
arch
/
arm64
/
kernel
/
Makefile
diff --git
a/arch/arm64/kernel/Makefile
b/arch/arm64/kernel/Makefile
index
b12e15b
..
426d076
100644
(file)
--- a/
arch/arm64/kernel/Makefile
+++ b/
arch/arm64/kernel/Makefile
@@
-35,6
+35,7
@@
arm64-obj-$(CONFIG_KGDB) += kgdb.o
arm64-obj-$(CONFIG_EFI) += efi.o efi-stub.o efi-entry.o
arm64-obj-$(CONFIG_PCI) += pci.o
arm64-obj-$(CONFIG_ARMV8_DEPRECATED) += armv8_deprecated.o
+arm64-obj-$(CONFIG_ACPI) += acpi.o
obj-y += $(arm64-obj-y) vdso/
obj-m += $(arm64-obj-m)