diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-02 22:00:29 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-02 22:00:29 -0400 |
| commit | f7572da502916e6abac06d698c0b6a7119cea0c1 (patch) | |
| tree | 5c6d729ed7bb6cc06a1f5f7bd3cfa81e1eff1337 /include/linux | |
| parent | c000131c711f68cb68712e6553ddce5fa6ad5c5c (diff) | |
| parent | 8e29da9ee8958cc17e27f4053420f1c982614793 (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:
i2c: Fix bad hint about irqs in i2c.h
i2c: Documentation: fix device matching description
Diffstat (limited to 'include/linux')
| -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 fb9af6a0fe9c..8dc730132192 100644 --- a/include/linux/i2c.h +++ b/include/linux/i2c.h | |||
| @@ -171,7 +171,7 @@ struct i2c_client { | |||
| 171 | struct i2c_adapter *adapter; /* the adapter we sit on */ | 171 | struct i2c_adapter *adapter; /* the adapter we sit on */ |
| 172 | struct i2c_driver *driver; /* and our access routines */ | 172 | struct i2c_driver *driver; /* and our access routines */ |
| 173 | struct device dev; /* the device structure */ | 173 | struct device dev; /* the device structure */ |
| 174 | int irq; /* irq issued by device (or -1) */ | 174 | int irq; /* irq issued by device */ |
| 175 | struct list_head list; /* DEPRECATED */ | 175 | struct list_head list; /* DEPRECATED */ |
| 176 | struct completion released; | 176 | struct completion released; |
| 177 | }; | 177 | }; |