diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-11-17 08:30:54 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-11-17 08:30:54 +0100 |
| commit | 89a01c51cbe3b6ae81008e8c91235be583df8c50 (patch) | |
| tree | 0f2e42652d8ebdfc6aeaa8f7c1b5b834f4a5d649 /drivers/acpi/dptf/int340x_thermal.c | |
| parent | f4474c9f0bba17857b1a47c8dc89c07a0845c2b2 (diff) | |
| parent | a8d9df5a509a232a959e4ef2e281f7ecd77810d6 (diff) | |
| download | talos-op-linux-89a01c51cbe3b6ae81008e8c91235be583df8c50.tar.gz talos-op-linux-89a01c51cbe3b6ae81008e8c91235be583df8c50.zip | |
Merge branch 'x86/cpufeature' into x86/asm, to pick up dependency
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/acpi/dptf/int340x_thermal.c')
| -rw-r--r-- | drivers/acpi/dptf/int340x_thermal.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/dptf/int340x_thermal.c b/drivers/acpi/dptf/int340x_thermal.c index 33505c651f62..86364097e236 100644 --- a/drivers/acpi/dptf/int340x_thermal.c +++ b/drivers/acpi/dptf/int340x_thermal.c @@ -34,11 +34,11 @@ static int int340x_thermal_handler_attach(struct acpi_device *adev, const struct acpi_device_id *id) { if (IS_ENABLED(CONFIG_INT340X_THERMAL)) - acpi_create_platform_device(adev); + acpi_create_platform_device(adev, NULL); /* Intel SoC DTS thermal driver needs INT3401 to set IRQ descriptor */ else if (IS_ENABLED(CONFIG_INTEL_SOC_DTS_THERMAL) && id->driver_data == INT3401_DEVICE) - acpi_create_platform_device(adev); + acpi_create_platform_device(adev, NULL); return 1; } |
