diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 21:32:01 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 21:32:01 -0400 |
| commit | 5615ca7906aefbdc3318604c89db5931d0a25910 (patch) | |
| tree | c34bcc7e314f49005ad88ac84c908128729c0329 /drivers/i2c/algos/i2c-algo-sibyte.c | |
| parent | 7a9f8f93d2dad38f30fbc79d8a1e6517373aa4b6 (diff) | |
| parent | 9dfb7808fb05643b0d06df7411b94d9546696bf1 (diff) | |
Merge branch 'upstream'
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, |