From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 25 Jul 2016 11:43:03 +0000 (+0200)
Subject: Merge branches 'acpi-drivers', 'acpi-misc' and 'acpi-tools'
X-Git-Tag: v4.14-rc1~2833^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=54d0b14ad7cc4ff3c710f092a93638f359c1b14b;p=platform%2Fkernel%2Flinux-rpi.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 5b271f4,0325a53,251ce85,251ce85..88f54f0
--- 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/