diff options
| author | Roland Dreier <rolandd@cisco.com> | 2005-10-28 18:50:51 -0400 |
|---|---|---|
| committer | Roland Dreier <rolandd@cisco.com> | 2005-10-28 18:50:51 -0400 |
| commit | a4da0628efd788eb199dd9df225e296035ec2539 (patch) | |
| tree | 1e611030c993e1480dc2f07f26976d2d33002b0d /drivers/i2c/algos/i2c-algo-sibyte.c | |
| parent | 70a30e16a8a9d22396a4d1e96af86e43594df584 (diff) | |
| parent | 20731945ae743034353a88c307920d1f16cf8ac8 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/i2c/algos/i2c-algo-sibyte.c')
| -rw-r--r-- | drivers/i2c/algos/i2c-algo-sibyte.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/algos/i2c-algo-sibyte.c b/drivers/i2c/algos/i2c-algo-sibyte.c index 8ed5ad12552f..938848ae162d 100644 --- a/drivers/i2c/algos/i2c-algo-sibyte.c +++ b/drivers/i2c/algos/i2c-algo-sibyte.c | |||
| @@ -42,7 +42,7 @@ | |||
| 42 | 42 | ||
| 43 | /* module parameters: | 43 | /* module parameters: |
| 44 | */ | 44 | */ |
| 45 | static int bit_scan=0; /* have a look at what's hanging 'round */ | 45 | static int bit_scan; /* have a look at what's hanging 'round */ |
| 46 | 46 | ||
| 47 | 47 | ||
| 48 | static int smbus_xfer(struct i2c_adapter *i2c_adap, u16 addr, | 48 | static int smbus_xfer(struct i2c_adapter *i2c_adap, u16 addr, |