diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-03-09 02:17:32 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-03-09 02:17:32 -0500 |
| commit | ce67eef6a112bb283c6db39f9195800f31f5599a (patch) | |
| tree | 34f2e7fbd0b9838abba482dbb1a7db09e6fbb53c /drivers/i2c/algos/i2c-algo-pca.c | |
| parent | 776943fd6f104a6e8457dc95a17282e69e963666 (diff) | |
| parent | 57d54889cd00db2752994b389ba714138652e60c (diff) | |
Merge commit 'v2.6.34-rc1' into for-linus
Diffstat (limited to 'drivers/i2c/algos/i2c-algo-pca.c')
| -rw-r--r-- | drivers/i2c/algos/i2c-algo-pca.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/i2c/algos/i2c-algo-pca.c b/drivers/i2c/algos/i2c-algo-pca.c index 78d42aae0089..dcdaf8e675bf 100644 --- a/drivers/i2c/algos/i2c-algo-pca.c +++ b/drivers/i2c/algos/i2c-algo-pca.c | |||
| @@ -453,8 +453,6 @@ static int pca_init(struct i2c_adapter *adap) | |||
| 453 | */ | 453 | */ |
| 454 | int raise_fall_time; | 454 | int raise_fall_time; |
| 455 | 455 | ||
| 456 | struct i2c_algo_pca_data *pca_data = adap->algo_data; | ||
| 457 | |||
| 458 | /* Ignore the reset function from the module, | 456 | /* Ignore the reset function from the module, |
| 459 | * we can use the parallel bus reset | 457 | * we can use the parallel bus reset |
| 460 | */ | 458 | */ |