diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-24 18:40:19 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-24 18:40:19 -0500 |
| commit | 21209b61b0ca0aafb04b5ab3561e3c8e7c7f776d (patch) | |
| tree | 41b584d03391032cc6b1a5dc16b7e876cc8604b6 /include/linux/i2c.h | |
| parent | a792cd12cf07cf77c7d1d41b46b4f8327ecf82d0 (diff) | |
| parent | 531660ef5604c75de6fdead9da1304051af17c09 (diff) | |
Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
* 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
Add i2c_board_info for RiscPC PCF8583
i2c: Make sure i2c_algo_bit_data.timeout is HZ-independent
i2c-dev: Clarify the unit of ioctl I2C_TIMEOUT
i2c: Timeouts reach -1
i2c: Fix misplaced parentheses
Diffstat (limited to 'include/linux/i2c.h')
| -rw-r--r-- | include/linux/i2c.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/i2c.h b/include/linux/i2c.h index fcfbfea3af72..c86c3b07604c 100644 --- a/include/linux/i2c.h +++ b/include/linux/i2c.h | |||
| @@ -361,7 +361,7 @@ struct i2c_adapter { | |||
| 361 | struct mutex bus_lock; | 361 | struct mutex bus_lock; |
| 362 | struct mutex clist_lock; | 362 | struct mutex clist_lock; |
| 363 | 363 | ||
| 364 | int timeout; | 364 | int timeout; /* in jiffies */ |
| 365 | int retries; | 365 | int retries; |
| 366 | struct device dev; /* the adapter device */ | 366 | struct device dev; /* the adapter device */ |
| 367 | 367 | ||