diff -ura xx-linux-2.6-6-rc3-mm2/drivers/i2c/chips/adm1021.c linux-2.6-6-rc3-mm2/drivers/i2c/chips/adm1021.c --- xx-linux-2.6-6-rc3-mm2/drivers/i2c/chips/adm1021.c 2004-05-09 11:11:10.000000000 +0200 +++ linux-2.6-6-rc3-mm2/drivers/i2c/chips/adm1021.c 2004-05-09 16:17:00.000000000 +0200 @@ -144,6 +144,7 @@ .name = "adm1021", .id = I2C_DRIVERID_ADM1021, .flags = I2C_DF_NOTIFY, + .class = I2C_CLASS_HWMON, .attach_adapter = adm1021_attach_adapter, .detach_client = adm1021_detach_client, }; @@ -200,8 +201,6 @@ static int adm1021_attach_adapter(struct i2c_adapter *adapter) { - if (!(adapter->class & I2C_CLASS_HWMON)) - return 0; return i2c_detect(adapter, &addr_data, adm1021_detect); } diff -ura xx-linux-2.6-6-rc3-mm2/drivers/i2c/chips/asb100.c linux-2.6-6-rc3-mm2/drivers/i2c/chips/asb100.c --- xx-linux-2.6-6-rc3-mm2/drivers/i2c/chips/asb100.c 2004-05-09 11:11:10.000000000 +0200 +++ linux-2.6-6-rc3-mm2/drivers/i2c/chips/asb100.c 2004-05-09 16:13:42.000000000 +0200 @@ -233,6 +233,7 @@ .name = "asb100", .id = I2C_DRIVERID_ASB100, .flags = I2C_DF_NOTIFY, + .class = I2C_CLASS_HWMON, .attach_adapter = asb100_attach_adapter, .detach_client = asb100_detach_client, }; @@ -609,8 +610,6 @@ */ static int asb100_attach_adapter(struct i2c_adapter *adapter) { - if (!(adapter->class & I2C_CLASS_HWMON)) - return 0; return i2c_detect(adapter, &addr_data, asb100_detect); } diff -ura xx-linux-2.6-6-rc3-mm2/drivers/i2c/chips/ds1621.c linux-2.6-6-rc3-mm2/drivers/i2c/chips/ds1621.c --- xx-linux-2.6-6-rc3-mm2/drivers/i2c/chips/ds1621.c 2004-05-09 11:05:29.000000000 +0200 +++ linux-2.6-6-rc3-mm2/drivers/i2c/chips/ds1621.c 2004-05-09 16:11:42.000000000 +0200 @@ -92,6 +92,7 @@ .name = "ds1621", .id = I2C_DRIVERID_DS1621, .flags = I2C_DF_NOTIFY, + .class = I2C_CLASS_HWMON, .attach_adapter = ds1621_attach_adapter, .detach_client = ds1621_detach_client, }; diff -ura xx-linux-2.6-6-rc3-mm2/drivers/i2c/chips/eeprom.c linux-2.6-6-rc3-mm2/drivers/i2c/chips/eeprom.c --- xx-linux-2.6-6-rc3-mm2/drivers/i2c/chips/eeprom.c 2004-05-09 11:05:29.000000000 +0200 +++ linux-2.6-6-rc3-mm2/drivers/i2c/chips/eeprom.c 2004-05-09 16:11:59.000000000 +0200 @@ -82,6 +82,7 @@ .name = "eeprom", .id = I2C_DRIVERID_EEPROM, .flags = I2C_DF_NOTIFY, + .class = I2C_CLASS_HWMON, .attach_adapter = eeprom_attach_adapter, .detach_client = eeprom_detach_client, }; diff -ura xx-linux-2.6-6-rc3-mm2/drivers/i2c/chips/fscher.c linux-2.6-6-rc3-mm2/drivers/i2c/chips/fscher.c --- xx-linux-2.6-6-rc3-mm2/drivers/i2c/chips/fscher.c 2004-05-09 11:11:10.000000000 +0200 +++ linux-2.6-6-rc3-mm2/drivers/i2c/chips/fscher.c 2004-05-09 16:13:00.000000000 +0200 @@ -124,6 +124,7 @@ .name = "fscher", .id = I2C_DRIVERID_FSCHER, .flags = I2C_DF_NOTIFY, + .class = I2C_CLASS_HWMON, .attach_adapter = fscher_attach_adapter, .detach_client = fscher_detach_client, }; @@ -293,8 +294,6 @@ static int fscher_attach_adapter(struct i2c_adapter *adapter) { - if (!(adapter->class & I2C_CLASS_HWMON)) - return 0; return i2c_detect(adapter, &addr_data, fscher_detect); } diff -ura xx-linux-2.6-6-rc3-mm2/drivers/i2c/chips/gl518sm.c linux-2.6-6-rc3-mm2/drivers/i2c/chips/gl518sm.c --- xx-linux-2.6-6-rc3-mm2/drivers/i2c/chips/gl518sm.c 2004-05-09 11:11:10.000000000 +0200 +++ linux-2.6-6-rc3-mm2/drivers/i2c/chips/gl518sm.c 2004-05-09 16:12:21.000000000 +0200 @@ -156,6 +156,7 @@ .name = "gl518sm", .id = I2C_DRIVERID_GL518, .flags = I2C_DF_NOTIFY, + .class = I2C_CLASS_HWMON, .attach_adapter = gl518_attach_adapter, .detach_client = gl518_detach_client, }; @@ -335,8 +336,6 @@ static int gl518_attach_adapter(struct i2c_adapter *adapter) { - if (!(adapter->class & I2C_CLASS_HWMON)) - return 0; return i2c_detect(adapter, &addr_data, gl518_detect); } diff -ura xx-linux-2.6-6-rc3-mm2/drivers/i2c/chips/it87.c linux-2.6-6-rc3-mm2/drivers/i2c/chips/it87.c --- xx-linux-2.6-6-rc3-mm2/drivers/i2c/chips/it87.c 2004-05-09 11:11:10.000000000 +0200 +++ linux-2.6-6-rc3-mm2/drivers/i2c/chips/it87.c 2004-05-09 16:16:14.000000000 +0200 @@ -173,6 +173,7 @@ .name = "it87", .id = I2C_DRIVERID_IT87, .flags = I2C_DF_NOTIFY, + .class = I2C_CLASS_HWMON, .attach_adapter = it87_attach_adapter, .detach_client = it87_detach_client, }; @@ -500,8 +501,6 @@ * when a new adapter is inserted (and it87_driver is still present) */ static int it87_attach_adapter(struct i2c_adapter *adapter) { - if (!(adapter->class & I2C_CLASS_HWMON)) - return 0; return i2c_detect(adapter, &addr_data, it87_detect); } diff -ura xx-linux-2.6-6-rc3-mm2/drivers/i2c/chips/lm78.c linux-2.6-6-rc3-mm2/drivers/i2c/chips/lm78.c --- xx-linux-2.6-6-rc3-mm2/drivers/i2c/chips/lm78.c 2004-05-09 11:11:10.000000000 +0200 +++ linux-2.6-6-rc3-mm2/drivers/i2c/chips/lm78.c 2004-05-09 16:15:57.000000000 +0200 @@ -229,6 +229,7 @@ .name = "lm78", .id = I2C_DRIVERID_LM78, .flags = I2C_DF_NOTIFY, + .class = I2C_CLASS_HWMON, .attach_adapter = lm78_attach_adapter, .detach_client = lm78_detach_client, }; @@ -488,8 +489,6 @@ * when a new adapter is inserted (and lm78_driver is still present) */ static int lm78_attach_adapter(struct i2c_adapter *adapter) { - if (!(adapter->class & I2C_CLASS_HWMON)) - return 0; return i2c_detect(adapter, &addr_data, lm78_detect); } diff -ura xx-linux-2.6-6-rc3-mm2/drivers/i2c/chips/lm80.c linux-2.6-6-rc3-mm2/drivers/i2c/chips/lm80.c --- xx-linux-2.6-6-rc3-mm2/drivers/i2c/chips/lm80.c 2004-05-09 11:11:10.000000000 +0200 +++ linux-2.6-6-rc3-mm2/drivers/i2c/chips/lm80.c 2004-05-09 16:15:28.000000000 +0200 @@ -156,6 +156,7 @@ .name = "lm80", .id = I2C_DRIVERID_LM80, .flags = I2C_DF_NOTIFY, + .class = I2C_CLASS_HWMON, .attach_adapter = lm80_attach_adapter, .detach_client = lm80_detach_client, }; @@ -376,8 +377,6 @@ static int lm80_attach_adapter(struct i2c_adapter *adapter) { - if (!(adapter->class & I2C_CLASS_HWMON)) - return 0; return i2c_detect(adapter, &addr_data, lm80_detect); } diff -ura xx-linux-2.6-6-rc3-mm2/drivers/i2c/chips/lm83.c linux-2.6-6-rc3-mm2/drivers/i2c/chips/lm83.c --- xx-linux-2.6-6-rc3-mm2/drivers/i2c/chips/lm83.c 2004-05-09 11:11:10.000000000 +0200 +++ linux-2.6-6-rc3-mm2/drivers/i2c/chips/lm83.c 2004-05-09 16:15:08.000000000 +0200 @@ -125,6 +125,7 @@ .name = "lm83", .id = I2C_DRIVERID_LM83, .flags = I2C_DF_NOTIFY, + .class = I2C_CLASS_HWMON, .attach_adapter = lm83_attach_adapter, .detach_client = lm83_detach_client, }; @@ -216,8 +217,6 @@ static int lm83_attach_adapter(struct i2c_adapter *adapter) { - if (!(adapter->class & I2C_CLASS_HWMON)) - return 0; return i2c_detect(adapter, &addr_data, lm83_detect); } diff -ura xx-linux-2.6-6-rc3-mm2/drivers/i2c/chips/lm85.c linux-2.6-6-rc3-mm2/drivers/i2c/chips/lm85.c --- xx-linux-2.6-6-rc3-mm2/drivers/i2c/chips/lm85.c 2004-05-09 11:05:29.000000000 +0200 +++ linux-2.6-6-rc3-mm2/drivers/i2c/chips/lm85.c 2004-05-09 16:14:53.000000000 +0200 @@ -403,6 +403,7 @@ .name = "lm85", .id = I2C_DRIVERID_LM85, .flags = I2C_DF_NOTIFY, + .class = I2C_CLASS_HWMON, .attach_adapter = lm85_attach_adapter, .detach_client = lm85_detach_client, }; diff -ura xx-linux-2.6-6-rc3-mm2/drivers/i2c/chips/lm90.c linux-2.6-6-rc3-mm2/drivers/i2c/chips/lm90.c --- xx-linux-2.6-6-rc3-mm2/drivers/i2c/chips/lm90.c 2004-05-09 11:11:10.000000000 +0200 +++ linux-2.6-6-rc3-mm2/drivers/i2c/chips/lm90.c 2004-05-09 16:14:33.000000000 +0200 @@ -146,6 +146,7 @@ .name = "lm90", .id = I2C_DRIVERID_LM90, .flags = I2C_DF_NOTIFY, + .class = I2C_CLASS_HWMON, .attach_adapter = lm90_attach_adapter, .detach_client = lm90_detach_client, }; @@ -274,8 +275,6 @@ static int lm90_attach_adapter(struct i2c_adapter *adapter) { - if (!(adapter->class & I2C_CLASS_HWMON)) - return 0; return i2c_detect(adapter, &addr_data, lm90_detect); } diff -ura xx-linux-2.6-6-rc3-mm2/drivers/i2c/chips/pcf8574.c linux-2.6-6-rc3-mm2/drivers/i2c/chips/pcf8574.c --- xx-linux-2.6-6-rc3-mm2/drivers/i2c/chips/pcf8574.c 2004-05-09 11:05:29.000000000 +0200 +++ linux-2.6-6-rc3-mm2/drivers/i2c/chips/pcf8574.c 2004-05-09 16:10:36.000000000 +0200 @@ -73,6 +73,7 @@ .name = "pcf8574", .id = I2C_DRIVERID_PCF8574, .flags = I2C_DF_NOTIFY, + .class = I2C_CLASS_HWMON, .attach_adapter = pcf8574_attach_adapter, .detach_client = pcf8574_detach_client, }; diff -ura xx-linux-2.6-6-rc3-mm2/drivers/i2c/chips/pcf8591.c linux-2.6-6-rc3-mm2/drivers/i2c/chips/pcf8591.c --- xx-linux-2.6-6-rc3-mm2/drivers/i2c/chips/pcf8591.c 2004-05-09 11:05:29.000000000 +0200 +++ linux-2.6-6-rc3-mm2/drivers/i2c/chips/pcf8591.c 2004-05-09 16:10:09.000000000 +0200 @@ -95,6 +95,7 @@ .name = "pcf8591", .id = I2C_DRIVERID_PCF8591, .flags = I2C_DF_NOTIFY, + .class = I2C_CLASS_HWMON, .attach_adapter = pcf8591_attach_adapter, .detach_client = pcf8591_detach_client, }; diff -ura xx-linux-2.6-6-rc3-mm2/drivers/i2c/chips/via686a.c linux-2.6-6-rc3-mm2/drivers/i2c/chips/via686a.c --- xx-linux-2.6-6-rc3-mm2/drivers/i2c/chips/via686a.c 2004-05-09 11:11:10.000000000 +0200 +++ linux-2.6-6-rc3-mm2/drivers/i2c/chips/via686a.c 2004-05-09 16:16:46.000000000 +0200 @@ -586,6 +586,7 @@ .name = "via686a", .id = I2C_DRIVERID_VIA686A, .flags = I2C_DF_NOTIFY, + .class = I2C_CLASS_HWMON, .attach_adapter = via686a_attach_adapter, .detach_client = via686a_detach_client, }; @@ -594,8 +595,6 @@ /* This is called when the module is loaded */ static int via686a_attach_adapter(struct i2c_adapter *adapter) { - if (!(adapter->class & I2C_CLASS_HWMON)) - return 0; return i2c_detect(adapter, &addr_data, via686a_detect); } diff -ura xx-linux-2.6-6-rc3-mm2/drivers/i2c/chips/w83627hf.c linux-2.6-6-rc3-mm2/drivers/i2c/chips/w83627hf.c --- xx-linux-2.6-6-rc3-mm2/drivers/i2c/chips/w83627hf.c 2004-05-09 11:05:29.000000000 +0200 +++ linux-2.6-6-rc3-mm2/drivers/i2c/chips/w83627hf.c 2004-05-09 16:11:27.000000000 +0200 @@ -331,6 +331,7 @@ .name = "w83627hf", .id = I2C_DRIVERID_W83627HF, .flags = I2C_DF_NOTIFY, + .class = I2C_CLASS_HWMON, .attach_adapter = w83627hf_attach_adapter, .detach_client = w83627hf_detach_client, }; diff -ura xx-linux-2.6-6-rc3-mm2/drivers/i2c/chips/w83781d.c linux-2.6-6-rc3-mm2/drivers/i2c/chips/w83781d.c --- xx-linux-2.6-6-rc3-mm2/drivers/i2c/chips/w83781d.c 2004-05-09 11:11:10.000000000 +0200 +++ linux-2.6-6-rc3-mm2/drivers/i2c/chips/w83781d.c 2004-05-09 16:17:18.000000000 +0200 @@ -281,6 +281,7 @@ .name = "w83781d", .id = I2C_DRIVERID_W83781D, .flags = I2C_DF_NOTIFY, + .class = I2C_CLASS_HWMON, .attach_adapter = w83781d_attach_adapter, .detach_client = w83781d_detach_client, }; @@ -905,8 +906,6 @@ static int w83781d_attach_adapter(struct i2c_adapter *adapter) { - if (!(adapter->class & I2C_CLASS_HWMON)) - return 0; return i2c_detect(adapter, &addr_data, w83781d_detect); } diff -ura xx-linux-2.6-6-rc3-mm2/drivers/i2c/chips/w83l785ts.c linux-2.6-6-rc3-mm2/drivers/i2c/chips/w83l785ts.c --- xx-linux-2.6-6-rc3-mm2/drivers/i2c/chips/w83l785ts.c 2004-05-09 11:11:10.000000000 +0200 +++ linux-2.6-6-rc3-mm2/drivers/i2c/chips/w83l785ts.c 2004-05-09 16:13:22.000000000 +0200 @@ -96,6 +96,7 @@ .name = "w83l785ts", .id = I2C_DRIVERID_W83L785TS, .flags = I2C_DF_NOTIFY, + .class = I2C_CLASS_HWMON, .attach_adapter = w83l785ts_attach_adapter, .detach_client = w83l785ts_detach_client, }; @@ -145,8 +146,6 @@ static int w83l785ts_attach_adapter(struct i2c_adapter *adapter) { - if (!(adapter->class & I2C_CLASS_HWMON)) - return 0; return i2c_detect(adapter, &addr_data, w83l785ts_detect); } diff -ura xx-linux-2.6-6-rc3-mm2/drivers/i2c/i2c-dev.c linux-2.6-6-rc3-mm2/drivers/i2c/i2c-dev.c --- xx-linux-2.6-6-rc3-mm2/drivers/i2c/i2c-dev.c 2004-05-09 11:05:29.000000000 +0200 +++ linux-2.6-6-rc3-mm2/drivers/i2c/i2c-dev.c 2004-05-09 16:06:33.000000000 +0200 @@ -500,6 +500,7 @@ .name = "dev_driver", .id = I2C_DRIVERID_I2CDEV, .flags = I2C_DF_NOTIFY, + .class = I2C_CLASS_ALL, .attach_adapter = i2cdev_attach_adapter, .detach_adapter = i2cdev_detach_adapter, .detach_client = i2cdev_detach_client,