diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-02 00:35:16 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-02 00:35:16 -0500 |
| commit | aa4abc9bcce0d2a7ec189e897f8f8c58ca04643b (patch) | |
| tree | 22ef88d84a2e06380bb6a853c3ba28657e4e5f92 /include/linux/i2c-dev.h | |
| parent | 814c01dc7c533033b4e99981a2e24a6195bfb43c (diff) | |
| parent | 52c0326beaa3cb0049d0f1c51c6ad5d4a04e4430 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-tx.c
net/8021q/vlan_core.c
net/core/dev.c
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 @@ | |||
| 33 | */ | 33 | */ |
| 34 | #define I2C_RETRIES 0x0701 /* number of times a device address should | 34 | #define I2C_RETRIES 0x0701 /* number of times a device address should |
| 35 | be polled when not acknowledging */ | 35 | be polled when not acknowledging */ |
| 36 | #define I2C_TIMEOUT 0x0702 /* set timeout in jiffies - call with int */ | 36 | #define I2C_TIMEOUT 0x0702 /* set timeout in units of 10 ms */ |
| 37 | 37 | ||
| 38 | /* NOTE: Slave address is 7 or 10 bits, but 10-bit addresses | 38 | /* NOTE: Slave address is 7 or 10 bits, but 10-bit addresses |
| 39 | * are NOT supported! (due to code brokenness) | 39 | * are NOT supported! (due to code brokenness) |