From c7e37f99b6c11b54b5b1ff87c02197b16cdbad96 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Thu, 24 May 2012 22:18:58 +0200 Subject: [PATCH] --- yaml --- r: 309398 b: refs/heads/master c: 2d8c7ff52c2459a25034ac8ddc230e67cc0e2b67 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/hwmon/Kconfig | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 651d812c02d3..2ec727b67795 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bb644913a7d6dabcc4a1640817fa7b68938a56eb +refs/heads/master: 2d8c7ff52c2459a25034ac8ddc230e67cc0e2b67 diff --git a/trunk/drivers/hwmon/Kconfig b/trunk/drivers/hwmon/Kconfig index 7cd9bf42108b..6f1d167cb1ea 100644 --- a/trunk/drivers/hwmon/Kconfig +++ b/trunk/drivers/hwmon/Kconfig @@ -1036,8 +1036,9 @@ config SENSORS_SCH56XX_COMMON config SENSORS_SCH5627 tristate "SMSC SCH5627" - depends on !PPC + depends on !PPC && WATCHDOG select SENSORS_SCH56XX_COMMON + select WATCHDOG_CORE help If you say yes here you get support for the hardware monitoring features of the SMSC SCH5627 Super-I/O chip including support for @@ -1048,8 +1049,9 @@ config SENSORS_SCH5627 config SENSORS_SCH5636 tristate "SMSC SCH5636" - depends on !PPC + depends on !PPC && WATCHDOG select SENSORS_SCH56XX_COMMON + select WATCHDOG_CORE help SMSC SCH5636 Super I/O chips include an embedded microcontroller for hardware monitoring solutions, allowing motherboard manufacturers to