diff --git a/[refs] b/[refs]
index a476d84a5262..8ecd599c42e4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d7f014e55c5227220da1f021c518487fcfd585a
+refs/heads/master: ece54e2ff45062852e4647e85b2bb5f6aee8211c
diff --git a/trunk/drivers/thermal/Kconfig b/trunk/drivers/thermal/Kconfig
index 69f19f224875..17e71d56f31e 100644
--- a/trunk/drivers/thermal/Kconfig
+++ b/trunk/drivers/thermal/Kconfig
@@ -4,7 +4,6 @@
 
 menuconfig THERMAL
 	bool "Generic Thermal sysfs driver"
-	default y
 	help
 	  Generic Thermal Sysfs driver offers a generic mechanism for
 	  thermal management. Usually it's made up of one or more thermal