git.codelabs.ch
/
muen
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'acpi-pmic', 'acpi-apei' and 'acpi-x86'
[muen/linux.git]
/
drivers
/
acpi
/
Makefile
diff --git
a/drivers/acpi/Makefile
b/drivers/acpi/Makefile
index 90265ab4437aef84cc413546c996f9edc6a39e17..709c1120f315a0afb092f58b9272fd5b102ca50a 100644
(file)
--- a/
drivers/acpi/Makefile
+++ b/
drivers/acpi/Makefile
@@
-1,3
+1,4
@@
+# SPDX-License-Identifier: GPL-2.0
#
# Makefile for the Linux ACPI interpreter
#
@@
-107,6
+108,8
@@
obj-$(CONFIG_CHT_WC_PMIC_OPREGION) += pmic/intel_pmic_chtwc.o
obj-$(CONFIG_ACPI_CONFIGFS) += acpi_configfs.o
+obj-$(CONFIG_TPS68470_PMIC_OPREGION) += pmic/tps68470_pmic.o
+
video-objs += acpi_video.o video_detect.o
obj-y += dptf/