diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-06 18:25:08 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-06 18:25:08 -0500 |
| commit | 0feb9bfcfa3f9bf67a4a1e3f2608700ad73f92ed (patch) | |
| tree | 22c71657387b42787bc070502899a881ed909f39 /drivers/i2c/busses/i2c-ibm_iic.c | |
| parent | d8d8f6a4fd635dcc9e4f946394c1fbde85eeab66 (diff) | |
| parent | ccf18968b1bbc2fb117190a1984ac2a826dac228 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6
Diffstat (limited to 'drivers/i2c/busses/i2c-ibm_iic.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-ibm_iic.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/i2c/busses/i2c-ibm_iic.c b/drivers/i2c/busses/i2c-ibm_iic.c index 1a587253d716..87fae937e666 100644 --- a/drivers/i2c/busses/i2c-ibm_iic.c +++ b/drivers/i2c/busses/i2c-ibm_iic.c | |||
| @@ -725,6 +725,7 @@ static int __devinit iic_probe(struct ocp_device *ocp){ | |||
| 725 | strcpy(adap->name, "IBM IIC"); | 725 | strcpy(adap->name, "IBM IIC"); |
| 726 | i2c_set_adapdata(adap, dev); | 726 | i2c_set_adapdata(adap, dev); |
| 727 | adap->id = I2C_HW_OCP; | 727 | adap->id = I2C_HW_OCP; |
| 728 | adap->class = I2C_CLASS_HWMON; | ||
| 728 | adap->algo = &iic_algo; | 729 | adap->algo = &iic_algo; |
| 729 | adap->client_register = NULL; | 730 | adap->client_register = NULL; |
| 730 | adap->client_unregister = NULL; | 731 | adap->client_unregister = NULL; |