diff options
| author | Zhang Rui <rui.zhang@intel.com> | 2014-10-17 10:30:58 +0400 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com> | 2014-10-17 10:30:58 +0400 |
| commit | 6ceaf58abe25e86292152005c51169796bad3407 (patch) | |
| tree | e97a032bc9dc63da9939136bd32ed5e0ad0f09bc /drivers/acpi/scan.c | |
| parent | 9ceaa81efd1dd5ec83cf6be5a9445809583a03b6 (diff) | |
| parent | d8054749c6795073cb427465a726213d45898f68 (diff) | |
| download | linux-6ceaf58abe25e86292152005c51169796bad3407.tar.xz | |
Merge branch 'int340x-thermal' of .git into next
Diffstat (limited to 'drivers/acpi/scan.c')
| -rw-r--r-- | drivers/acpi/scan.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 0a817ad24f16..eed9740651f8 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -2306,6 +2306,7 @@ int __init acpi_scan_init(void) acpi_container_init(); acpi_memory_hotplug_init(); acpi_pnp_init(); + acpi_int340x_thermal_init(); mutex_lock(&acpi_scan_lock); /* |