Merge branches 'acpi-drivers', 'acpi-misc' and 'acpi-tools'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 25 Jul 2016 11:43:03 +0000 (13:43 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 25 Jul 2016 11:43:03 +0000 (13:43 +0200)
* 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

1  2  3  4 
drivers/acpi/Kconfig
drivers/acpi/Makefile

Simple merge
index 5b271f492be3a1801ccec059c1736537858b6f39,0325a539b1c8e23721a79cc405ff8def8ffe4794,251ce85a66fbb4460e6c379d39f7ddd0e2062ce8,251ce85a66fbb4460e6c379d39f7ddd0e2062ce8..88f54f03e3d228a0bfabb674cc1a72b9a5177151
@@@@@ -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/