diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-13 11:32:48 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-13 11:32:48 -0400 |
| commit | 8371f87c9994d9942af5984309835aeb948ba579 (patch) | |
| tree | 54c70fc60b97c1ea9bd8409b0ef36f8322bbf60e /include | |
| parent | 0ad30b8fd5fe798aae80df6344b415d8309342cc (diff) | |
| parent | 935298696f469c0e07c73be687bd055878074ce0 (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: Let new-style drivers implement attach_adapter
i2c: Fix sparse warnings for I2C_BOARD_INFO()
i2c-voodoo3: Deprecate in favor of tdfxfb
i2c-algo-pca: Fix use of uninitialized variable in debug message
Diffstat (limited to 'include')
| -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 00ee11eb9092..ad2580596033 100644 --- a/include/linux/i2c.h +++ b/include/linux/i2c.h | |||
| @@ -274,7 +274,7 @@ struct i2c_board_info { | |||
| 274 | * are provided using conventional syntax. | 274 | * are provided using conventional syntax. |
| 275 | */ | 275 | */ |
| 276 | #define I2C_BOARD_INFO(dev_type, dev_addr) \ | 276 | #define I2C_BOARD_INFO(dev_type, dev_addr) \ |
| 277 | .type = (dev_type), .addr = (dev_addr) | 277 | .type = dev_type, .addr = (dev_addr) |
| 278 | 278 | ||
| 279 | 279 | ||
| 280 | /* Add-on boards should register/unregister their devices; e.g. a board | 280 | /* Add-on boards should register/unregister their devices; e.g. a board |