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
This commit is contained in:
Linus Torvalds
2008-07-02 19:00:29 -07:00
2 changed files with 15 additions and 5 deletions
+1 -1
View File
@@ -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;
};