Merge branch 'int340x-thermal' of .git into next

git-mirror · Oct 17, 2014 · 6ceaf58 · 6ceaf58
2 parents 9ceaa81 + d805474
commit 6ceaf58
Show file tree

Hide file tree

Showing 22 changed files with 1,867 additions and 408 deletions.
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
@@ -144,7 +144,7 @@ config ACPI_VIDEO
 
 config ACPI_FAN
 	tristate "Fan"
-	select THERMAL
+	depends on THERMAL
 	default y
 	help
 	  This driver supports ACPI fan devices, allowing user-mode

diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
@@ -43,6 +43,7 @@ acpi-y				+= pci_root.o pci_link.o pci_irq.o
 acpi-y				+= acpi_lpss.o
 acpi-y				+= acpi_platform.o
 acpi-y				+= acpi_pnp.o
+acpi-y				+= int340x_thermal.o
 acpi-y				+= power.o
 acpi-y				+= event.o
 acpi-y				+= sysfs.o

diff --git a/drivers/acpi/acpi_platform.c b/drivers/acpi/acpi_platform.c
@@ -113,3 +113,4 @@ struct platform_device *acpi_create_platform_device(struct acpi_device *adev)
 	kfree(resources);
 	return pdev;
 }
+EXPORT_SYMBOL_GPL(acpi_create_platform_device);
diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c
@@ -343,6 +343,7 @@ int acpi_device_update_power(struct acpi_device *device, int *state_p)
 
 	return 0;
 }
+EXPORT_SYMBOL_GPL(acpi_device_update_power);
 
 int acpi_bus_update_power(acpi_handle handle, int *state_p)
 {
-Original file line number
+Diff line change
@@ Expand Up @@
     	return 0;
     }
+    EXPORT_SYMBOL_GPL(acpi_device_update_power);
     int acpi_bus_update_power(acpi_handle handle, int *state_p)
     {
@@ Expand Down @@