diff options
| author | David S. Miller <davem@davemloft.net> | 2009-01-26 20:43:16 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-01-26 20:43:16 -0500 |
| commit | 3eacdf58c2c0b9507afedfc19108e98b992c31e4 (patch) | |
| tree | d95e7e022ff6e6181edce43fe97cf2883b5a91ed /drivers/i2c/busses/i2c-ali1563.c | |
| parent | dd0a251c8e087bca05e8f9a3657078591ae6e12b (diff) | |
| parent | 5376071069ec8a7e6a8112beab16fc24f5139475 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/i2c/busses/i2c-ali1563.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-ali1563.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-ali1563.c b/drivers/i2c/busses/i2c-ali1563.c index dd9e796fad69..f70f46582c6c 100644 --- a/drivers/i2c/busses/i2c-ali1563.c +++ b/drivers/i2c/busses/i2c-ali1563.c | |||
| @@ -386,7 +386,6 @@ static const struct i2c_algorithm ali1563_algorithm = { | |||
| 386 | 386 | ||
| 387 | static struct i2c_adapter ali1563_adapter = { | 387 | static struct i2c_adapter ali1563_adapter = { |
| 388 | .owner = THIS_MODULE, | 388 | .owner = THIS_MODULE, |
| 389 | .id = I2C_HW_SMBUS_ALI1563, | ||
| 390 | .class = I2C_CLASS_HWMON | I2C_CLASS_SPD, | 389 | .class = I2C_CLASS_HWMON | I2C_CLASS_SPD, |
| 391 | .algo = &ali1563_algorithm, | 390 | .algo = &ali1563_algorithm, |
| 392 | }; | 391 | }; |