diff options
| author | Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> | 2016-07-19 14:57:49 -0700 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-07-21 13:42:46 +0200 |
| commit | c11dd70fd7f50fca7dc05520ec8075f12d93cb63 (patch) | |
| tree | ef6364da1e4406a02bfda0a40d0e93d9ee27a650 /drivers/acpi | |
| parent | 6256ebd5daf93505f12b66916fb1b961b38f4cf2 (diff) | |
| download | linux-c11dd70fd7f50fca7dc05520ec8075f12d93cb63.tar.gz | |
ACPI / DPTF: move int340x_thermal.c to the DPTF folder
Since DPTF has its own folder under ACPI, move this file also there. Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/Makefile | 1 | ||||
| -rw-r--r-- | drivers/acpi/dptf/Makefile | 3 | ||||
| -rw-r--r-- | drivers/acpi/dptf/int340x_thermal.c (renamed from drivers/acpi/int340x_thermal.c) | 0 |
3 files changed, 3 insertions, 1 deletions
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile index f6d0cc0fb4e1..0325a539b1c8 100644 --- a/drivers/acpi/Makefile +++ b/drivers/acpi/Makefile @@ -44,7 +44,6 @@ acpi-y += acpi_lpss.o acpi_apd.o acpi-y += acpi_platform.o acpi-y += acpi_pnp.o acpi-$(CONFIG_ARM_AMBA) += acpi_amba.o -acpi-y += int340x_thermal.o acpi-y += power.o acpi-y += event.o acpi-$(CONFIG_ACPI_REDUCED_HARDWARE_ONLY) += evged.o diff --git a/drivers/acpi/dptf/Makefile b/drivers/acpi/dptf/Makefile index 62cbe8753a19..06ea8809583d 100644 --- a/drivers/acpi/dptf/Makefile +++ b/drivers/acpi/dptf/Makefile @@ -1 +1,4 @@ +obj-$(CONFIG_ACPI) += int340x_thermal.o obj-$(CONFIG_DPTF_POWER) += dptf_power.o + +ccflags-y += -Idrivers/acpi diff --git a/drivers/acpi/int340x_thermal.c b/drivers/acpi/dptf/int340x_thermal.c index 33505c651f62..33505c651f62 100644 --- a/drivers/acpi/int340x_thermal.c +++ b/drivers/acpi/dptf/int340x_thermal.c |