summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/Makefile
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-07-25 13:43:03 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-07-25 13:43:03 +0200
commit54d0b14ad7cc4ff3c710f092a93638f359c1b14b (patch)
tree563e67a8ef03451adf542d0273be62bf754d2a0b /drivers/acpi/Makefile
parentMerge branch 'acpi-pmic' (diff)
parentACPI / DPTF: move int340x_thermal.c to the DPTF folder (diff)
parentACPI / lpat: make it explicitly non-modular (diff)
parenttools/acpi: use CROSS_COMPILE to define prefix (diff)
downloadlinux-54d0b14ad7cc4ff3c710f092a93638f359c1b14b.tar.xz
linux-54d0b14ad7cc4ff3c710f092a93638f359c1b14b.zip
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