diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-06-17 14:24:23 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-06-17 14:24:23 +1000 |
commit | 24228d7624c9382df42288d7356d654fcd761ba7 (patch) | |
tree | b46b1194bfb9836c604d1b53b2ffe455b7032c7a /drivers/i2c/busses/i2c-mpc.c | |
parent | 9495508e5eeeba167d61ed6f94d6bc8ec8f4b4c7 (diff) | |
parent | 67f182faeb8041684d81d0dbadb5d348f7f069a8 (diff) |
Merge branch 'quilt/i2c'
Conflicts:
drivers/i2c/i2c-core.c
Diffstat (limited to 'drivers/i2c/busses/i2c-mpc.c')
-rw-r--r-- | drivers/i2c/busses/i2c-mpc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c index a076129de7e8..10b9342a36c2 100644 --- a/drivers/i2c/busses/i2c-mpc.c +++ b/drivers/i2c/busses/i2c-mpc.c @@ -311,7 +311,7 @@ static struct i2c_adapter mpc_ops = { .name = "MPC adapter", .id = I2C_HW_MPC107, .algo = &mpc_algo, - .class = I2C_CLASS_HWMON, + .class = I2C_CLASS_HWMON | I2C_CLASS_SPD, .timeout = 1, }; |