Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux...

diff --combined drivers/thermal/Kconfig
index 2d51912a6e408a338ff0e8c6727dc8a8d21c6dd1,743a674b42d8d8db3dced231afcef012231aeb9b..4eac89d0e5fcee996712a78b795d253d2b592875
--- 1/drivers/thermal/Kconfig
--- 2/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@@ -143,7 -143,7 +143,7 @@@ config RCAR_THERMA
  
  config KIRKWOOD_THERMAL
        tristate "Temperature sensor on Marvell Kirkwood SoCs"
 -      depends on ARCH_KIRKWOOD
 +      depends on ARCH_KIRKWOOD || MACH_KIRKWOOD
        depends on OF
        help
          Support for the Kirkwood thermal sensor driver into the Linux thermal
@@@ -227,7 -227,7 +227,7 @@@ source "drivers/thermal/ti-soc-thermal/
  endmenu
  
  menu "Samsung thermal drivers"
- depends on PLAT_SAMSUNG
+ depends on ARCH_EXYNOS
  source "drivers/thermal/samsung/Kconfig"
  endmenu