diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2010-05-22 02:36:56 -0400 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2010-05-22 02:36:56 -0400 |
commit | cf9b59e9d3e008591d1f54830f570982bb307a0d (patch) | |
tree | 113478ce8fd8c832ba726ffdf59b82cb46356476 /include/linux/i2c.h | |
parent | 44504b2bebf8b5823c59484e73096a7d6574471d (diff) | |
parent | f4b87dee923342505e1ddba8d34ce9de33e75050 (diff) |
Merge remote branch 'origin' into secretlab/next-devicetree
Merging in current state of Linus' tree to deal with merge conflicts and
build failures in vio.c after merge.
Conflicts:
drivers/i2c/busses/i2c-cpm.c
drivers/i2c/busses/i2c-mpc.c
drivers/net/gianfar.c
Also fixed up one line in arch/powerpc/kernel/vio.c to use the
correct node pointer.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'include/linux/i2c.h')
-rw-r--r-- | include/linux/i2c.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/i2c.h b/include/linux/i2c.h index 4f37ff1de7e1..21067b418536 100644 --- a/include/linux/i2c.h +++ b/include/linux/i2c.h | |||
@@ -359,6 +359,8 @@ struct i2c_adapter { | |||
359 | int nr; | 359 | int nr; |
360 | char name[48]; | 360 | char name[48]; |
361 | struct completion dev_released; | 361 | struct completion dev_released; |
362 | |||
363 | struct list_head userspace_clients; | ||
362 | }; | 364 | }; |
363 | #define to_i2c_adapter(d) container_of(d, struct i2c_adapter, dev) | 365 | #define to_i2c_adapter(d) container_of(d, struct i2c_adapter, dev) |
364 | 366 | ||