diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-21 04:39:51 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-21 04:39:51 -0500 |
| commit | 198030782cedf25391e67e7c88b04f87a5eb6563 (patch) | |
| tree | 5b7368c6bf052bcb4bb273497a57900720d36f51 /include/linux/of_i2c.h | |
| parent | 4ec71fa2d2c3f1040348f2604f4b8ccc833d1c2e (diff) | |
| parent | 92181f190b649f7ef2b79cbf5c00f26ccc66da2a (diff) | |
Merge branch 'x86/mm' into core/percpu
Conflicts:
arch/x86/mm/fault.c
Diffstat (limited to 'include/linux/of_i2c.h')
| -rw-r--r-- | include/linux/of_i2c.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/of_i2c.h b/include/linux/of_i2c.h index bd2a870ec296..34974b5a76f7 100644 --- a/include/linux/of_i2c.h +++ b/include/linux/of_i2c.h | |||
| @@ -17,4 +17,7 @@ | |||
| 17 | void of_register_i2c_devices(struct i2c_adapter *adap, | 17 | void of_register_i2c_devices(struct i2c_adapter *adap, |
| 18 | struct device_node *adap_node); | 18 | struct device_node *adap_node); |
| 19 | 19 | ||
| 20 | /* must call put_device() when done with returned i2c_client device */ | ||
| 21 | struct i2c_client *of_find_i2c_device_by_node(struct device_node *node); | ||
| 22 | |||
| 20 | #endif /* __LINUX_OF_I2C_H */ | 23 | #endif /* __LINUX_OF_I2C_H */ |