diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-07 22:59:27 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-07 22:59:27 +0300 |
| commit | fa7b906e7fef53b6c9eb3ecb8164b0a69e9e1a68 (patch) | |
| tree | 8fa745403e1506c211d00ce787d71ee647d65ea2 /drivers/i2c/busses/i2c-sh7760.c | |
| parent | 08249903ea233a79b4167395f2fb79ccd1fb5f94 (diff) | |
| parent | 66c7acf61dc6b27954bb9ceb8617d447ac03734a (diff) | |
| download | linux-fa7b906e7fef53b6c9eb3ecb8164b0a69e9e1a68.tar.xz | |
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: Use snprintf to set adapter names
Input: apanel - convert to new i2c binding
i2c: Drop I2C_CLASS_CAM_DIGITAL
i2c: Drop I2C_CLASS_CAM_ANALOG and I2C_CLASS_SOUND
i2c: Drop I2C_CLASS_ALL
i2c: Get rid of remaining bus_id access
i2c: Replace bus_id with dev_name(), dev_set_name()
Diffstat (limited to 'drivers/i2c/busses/i2c-sh7760.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-sh7760.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-sh7760.c b/drivers/i2c/busses/i2c-sh7760.c index 5e0e254976de..baa28b73ae42 100644 --- a/drivers/i2c/busses/i2c-sh7760.c +++ b/drivers/i2c/busses/i2c-sh7760.c @@ -475,7 +475,7 @@ static int __devinit sh7760_i2c_probe(struct platform_device *pdev) id->adap.nr = pdev->id; id->adap.algo = &sh7760_i2c_algo; - id->adap.class = I2C_CLASS_ALL; + id->adap.class = I2C_CLASS_HWMON | I2C_CLASS_SPD; id->adap.retries = 3; id->adap.algo_data = id; id->adap.dev.parent = &pdev->dev; |