summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-07-02 19:00:29 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-02 19:00:29 -0700
commitf7572da502916e6abac06d698c0b6a7119cea0c1 (patch)
tree5c6d729ed7bb6cc06a1f5f7bd3cfa81e1eff1337 /include
parentc000131c711f68cb68712e6553ddce5fa6ad5c5c (diff)
parent8e29da9ee8958cc17e27f4053420f1c982614793 (diff)
downloadconfigs-f7572da502916e6abac06d698c0b6a7119cea0c1.tar.gz
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')
-rw-r--r--include/linux/i2c.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index fb9af6a0fe9..8dc73013219 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -171,7 +171,7 @@ struct i2c_client {
struct i2c_adapter *adapter; /* the adapter we sit on */
struct i2c_driver *driver; /* and our access routines */
struct device dev; /* the device structure */
- int irq; /* irq issued by device (or -1) */
+ int irq; /* irq issued by device */
struct list_head list; /* DEPRECATED */
struct completion released;
};