Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

[mv-sheeva.git] / drivers / hwmon / abituguru.c

diff --git a/drivers/hwmon/abituguru.c b/drivers/hwmon/abituguru.c
index ab80b418bd69757a2279e518a6f8a68445e6dd19..59122cc0a50a1b39740970ab00adfb840a08c01d 100644 (file)
--- a/drivers/hwmon/abituguru.c
+++ b/drivers/hwmon/abituguru.c
@@ -529,9 +529,8 @@ abituguru_detect_no_bank2_sensors(struct abituguru_data *data)
                   -0x08 enable beep
                   -0x01 enable alarm
                   All other bits should be 0, but on some motherboards
-                  0x40 (bit 6) is also high, at least for fan1 */
-               if ((!i && (data->bank2_settings[i][0] & ~0xC9)) ||
-                    (i && (data->bank2_settings[i][0] & ~0x89))) {
+                  0x40 (bit 6) is also high for some of the fans?? */
+               if (data->bank2_settings[i][0] & ~0xC9) {
                        ABIT_UGURU_DEBUG(2, "  bank2 sensor %d does not seem "
                                "to be a fan sensor: settings[0] = %02X\n",
                                i, (unsigned int)data->bank2_settings[i][0]);