diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-28 11:26:12 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-28 11:26:12 -0400 |
| commit | 7a9787e1eba95a166265e6a260cf30af04ef0a99 (patch) | |
| tree | e730a4565e0318140d2fbd2f0415d18a339d7336 /drivers/i2c/busses/i2c-cpm.c | |
| parent | 41b9eb264c8407655db57b60b4457fe1b2ec9977 (diff) | |
| parent | 0173a3265b228da319ceb9c1ec6a5682fd1b2d92 (diff) | |
Merge commit 'v2.6.28-rc2' into x86/pci-ioapic-boot-irq-quirks
Diffstat (limited to 'drivers/i2c/busses/i2c-cpm.c')
| -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) |