summaryrefslogtreecommitdiffstats
path: root/include/linux/i2c.h
diff options
context:
space:
mode:
authorNeil Brown <neilb@notabene.brown>2008-07-08 10:11:50 +1000
committerNeil Brown <neilb@notabene.brown>2008-07-08 10:11:50 +1000
commit5b1a4bf220a8f6f2650fdfdfebfda0f22f674d97 (patch)
treea1f22225aace571661c29e59ebd024bc4619e054 /include/linux/i2c.h
parent1fe797e67fb07d605b82300934d0de67068a0aca (diff)
parentb7279469d66b55119784b8b9529c99c1955fe747 (diff)
downloadkernel-crypto-5b1a4bf220a8f6f2650fdfdfebfda0f22f674d97.tar.gz
kernel-crypto-5b1a4bf220a8f6f2650fdfdfebfda0f22f674d97.tar.xz
kernel-crypto-5b1a4bf220a8f6f2650fdfdfebfda0f22f674d97.zip
Merge branch 'master' into for-next
Diffstat (limited to 'include/linux/i2c.h')
-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;
};