Merge with /home/shaggy/git/linus-clean/

[~andy/linux] / drivers / Kconfig

diff --git a/drivers/Kconfig b/drivers/Kconfig
index 34efb2150e686e1d810894183d3c0986d64aec02..cecab0acc3fe6baf22311c574abdc96ede313b74 100644 (file)
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -44,6 +44,8 @@ source "drivers/i2c/Kconfig"
 
 source "drivers/w1/Kconfig"
 
+source "drivers/hwmon/Kconfig"
+
 source "drivers/misc/Kconfig"
 
 source "drivers/media/Kconfig"