diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/i2c/algos/i2c-algo-pca.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
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 | */ |