Merge branches 'release' and 'menlo' into release

[safe/jmp/linux-2.6] / drivers / Kconfig

diff --git a/drivers/Kconfig b/drivers/Kconfig
index d74d9fb..b86877b 100644 (file)
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -60,6 +60,8 @@ source "drivers/power/Kconfig"
 
 source "drivers/hwmon/Kconfig"
 
+source "drivers/thermal/Kconfig"
+
 source "drivers/watchdog/Kconfig"
 
 source "drivers/ssb/Kconfig"