diff options
author | Ingo Molnar | 2009-03-04 02:29:19 +0100 |
---|---|---|
committer | Ingo Molnar | 2009-03-04 02:29:19 +0100 |
commit | 91d75e209bd59695f0708d66964d928d45b3b2f3 (patch) | |
tree | 32cab1359d951e4193bebb181a0f0319824a2b95 /include/linux/i2c-dev.h | |
parent | xen: deal with virtually mapped percpu data (diff) | |
parent | Merge branches 'x86/apic', 'x86/cpu', 'x86/fixmap', 'x86/mm', 'x86/sched', 'x... (diff) | |
download | kernel-qcow2-linux-91d75e209bd59695f0708d66964d928d45b3b2f3.tar.gz kernel-qcow2-linux-91d75e209bd59695f0708d66964d928d45b3b2f3.tar.xz kernel-qcow2-linux-91d75e209bd59695f0708d66964d928d45b3b2f3.zip |
Merge branch 'x86/core' into core/percpu
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 311315b56b61..fd53bfd26470 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) |