diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-05 11:45:22 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-05 11:45:22 +0100 |
| commit | a140feab42d1cfd811930ab76104559c19dfc4b0 (patch) | |
| tree | 41fd871990e888dd5616a6bf1891a1ff307221df /include/linux/i2c-dev.h | |
| parent | 1075414b06109a99b0e87601e84c74a95bd45681 (diff) | |
| parent | fec6c6fec3e20637bee5d276fb61dd8b49a3f9cc (diff) | |
| download | op-kernel-dev-a140feab42d1cfd811930ab76104559c19dfc4b0.zip op-kernel-dev-a140feab42d1cfd811930ab76104559c19dfc4b0.tar.gz | |
Merge commit 'v2.6.29-rc7' into core/locking
Diffstat (limited to 'include/linux/i2c-dev.h')
| -rw-r--r-- | include/linux/i2c-dev.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/i2c-dev.h b/include/linux/i2c-dev.h index 311315b..fd53bfd 100644 --- a/include/linux/i2c-dev.h +++ b/include/linux/i2c-dev.h @@ -33,7 +33,7 @@ */ #define I2C_RETRIES 0x0701 /* number of times a device address should be polled when not acknowledging */ -#define I2C_TIMEOUT 0x0702 /* set timeout in jiffies - call with int */ +#define I2C_TIMEOUT 0x0702 /* set timeout in units of 10 ms */ /* NOTE: Slave address is 7 or 10 bits, but 10-bit addresses * are NOT supported! (due to code brokenness) |
