diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-21 00:49:55 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-21 00:49:55 -0400 |
| commit | 84dfcb4b318463cd4883b6a19937824f49aee564 (patch) | |
| tree | 56a96898bff3a2bd3a65abb28a8c018d28db85e8 /drivers/i2c | |
| parent | 34d81f858a3bdec568bf08c4feb997ccd3d40b94 (diff) | |
| parent | 672e806ee103c1709bcdcafabe65ba9c8ab5a63d (diff) | |
Merge commit 'kumar/kumar-for-2.6.28'
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/busses/i2c-cpm.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-cpm.c b/drivers/i2c/busses/i2c-cpm.c index 8164de1f4d72..228f75723063 100644 --- a/drivers/i2c/busses/i2c-cpm.c +++ b/drivers/i2c/busses/i2c-cpm.c | |||
| @@ -423,7 +423,6 @@ static const struct i2c_adapter cpm_ops = { | |||
| 423 | .owner = THIS_MODULE, | 423 | .owner = THIS_MODULE, |
| 424 | .name = "i2c-cpm", | 424 | .name = "i2c-cpm", |
| 425 | .algo = &cpm_i2c_algo, | 425 | .algo = &cpm_i2c_algo, |
| 426 | .class = I2C_CLASS_HWMON | I2C_CLASS_SPD, | ||
| 427 | }; | 426 | }; |
| 428 | 427 | ||
| 429 | static int __devinit cpm_i2c_setup(struct cpm_i2c *cpm) | 428 | static int __devinit cpm_i2c_setup(struct cpm_i2c *cpm) |