diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-30 12:07:25 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-30 12:07:25 -0700 |
commit | 0fb7f4f0cef8e7d2944189ff2cb68694ef4b683a (patch) | |
tree | 3186b3ecb8faf7f4c81a5d443243ed9d28adf402 /drivers/i2c/busses/scx200_i2c.c | |
parent | cdcba02a5f64f4df20b6749a0169124e38ecb733 (diff) | |
parent | da6801e38b7fba28fbdc0ceae6681d5a261a42a6 (diff) | |
download | op-kernel-dev-0fb7f4f0cef8e7d2944189ff2cb68694ef4b683a.zip op-kernel-dev-0fb7f4f0cef8e7d2944189ff2cb68694ef4b683a.tar.gz |
Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
* 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
i2c-s3c2410: Correct use of ! and &
i2c: The i2c mailing list is moving
scx200_i2c: Add missing class parameter
Diffstat (limited to 'drivers/i2c/busses/scx200_i2c.c')
-rw-r--r-- | drivers/i2c/busses/scx200_i2c.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/i2c/busses/scx200_i2c.c b/drivers/i2c/busses/scx200_i2c.c index c3022a0..e4c9853 100644 --- a/drivers/i2c/busses/scx200_i2c.c +++ b/drivers/i2c/busses/scx200_i2c.c @@ -81,6 +81,7 @@ static struct i2c_algo_bit_data scx200_i2c_data = { static struct i2c_adapter scx200_i2c_ops = { .owner = THIS_MODULE, + .class = I2C_CLASS_HWMON | I2C_CLASS_SPD, .id = I2C_HW_B_SCX200, .algo_data = &scx200_i2c_data, .name = "NatSemi SCx200 I2C", |