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-au1550.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-au1550.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-au1550.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-au1550.c b/drivers/i2c/busses/i2c-au1550.c index 66a04c2c660f..f78ce523e3db 100644 --- a/drivers/i2c/busses/i2c-au1550.c +++ b/drivers/i2c/busses/i2c-au1550.c | |||
| @@ -400,7 +400,6 @@ i2c_au1550_probe(struct platform_device *pdev) | |||
| 400 | priv->xfer_timeout = 200; | 400 | priv->xfer_timeout = 200; |
| 401 | priv->ack_timeout = 200; | 401 | priv->ack_timeout = 200; |
| 402 | 402 | ||
| 403 | priv->adap.id = I2C_HW_AU1550_PSC; | ||
| 404 | priv->adap.nr = pdev->id; | 403 | priv->adap.nr = pdev->id; |
| 405 | priv->adap.algo = &au1550_algo; | 404 | priv->adap.algo = &au1550_algo; |
| 406 | priv->adap.algo_data = priv; | 405 | priv->adap.algo_data = priv; |