From: Rafael J. Wysocki Date: Mon, 25 Jul 2016 11:43:03 +0000 (+0200) Subject: Merge branches 'acpi-drivers', 'acpi-misc' and 'acpi-tools' X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=54d0b14ad7cc4ff3c710f092a93638f359c1b14b;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git Merge branches 'acpi-drivers', 'acpi-misc' and 'acpi-tools' * acpi-drivers: ACPI / DPTF: move int340x_thermal.c to the DPTF folder ACPI / DPTF: Add DPTF power participant driver * acpi-misc: ACPI / lpat: make it explicitly non-modular ACPI / dock: make dock explicitly non-modular * acpi-tools: tools/acpi: use CROSS_COMPILE to define prefix --- 54d0b14ad7cc4ff3c710f092a93638f359c1b14b diff --cc drivers/acpi/Makefile index 5b271f492be3,0325a539b1c8,251ce85a66fb,251ce85a66fb..88f54f03e3d2 --- a/drivers/acpi/Makefile +++ b/drivers/acpi/Makefile @@@@@ -99,8 -98,6 -99,5 -99,5 +98,9 @@@@@ obj-$(CONFIG_ACPI_EXTLOG) += acpi_extlo obj-$(CONFIG_PMIC_OPREGION) += pmic/intel_pmic.o obj-$(CONFIG_CRC_PMIC_OPREGION) += pmic/intel_pmic_crc.o obj-$(CONFIG_XPOWER_PMIC_OPREGION) += pmic/intel_pmic_xpower.o +++obj-$(CONFIG_BXT_WC_PMIC_OPREGION) += pmic/intel_pmic_bxtwc.o +++ +++obj-$(CONFIG_ACPI_CONFIGFS) += acpi_configfs.o video-objs += acpi_video.o video_detect.o + ++obj-y += dptf/