diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-09-03 19:01:36 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-09-03 19:01:36 -0400 |
| commit | 516d5f8b04ce2bcd24f03323fc743ae25b81373d (patch) | |
| tree | ff37e84692dbef5063bbf22672eb8bfad0f25dd8 /include/linux/component.h | |
| parent | 6ba694560caeb3531dbedd5b3a37af037ef2a833 (diff) | |
| parent | 69e273c0b0a3c337a521d083374c918dc52c666f (diff) | |
Merge tag 'v3.17-rc3' into next
Sync with mainline to bring in Chrome EC changes.
Diffstat (limited to 'include/linux/component.h')
| -rw-r--r-- | include/linux/component.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/component.h b/include/linux/component.h index 68870182ca1e..c00dcc302611 100644 --- a/include/linux/component.h +++ b/include/linux/component.h | |||
| @@ -29,4 +29,11 @@ void component_master_del(struct device *, | |||
| 29 | int component_master_add_child(struct master *master, | 29 | int component_master_add_child(struct master *master, |
| 30 | int (*compare)(struct device *, void *), void *compare_data); | 30 | int (*compare)(struct device *, void *), void *compare_data); |
| 31 | 31 | ||
| 32 | struct component_match; | ||
| 33 | |||
| 34 | int component_master_add_with_match(struct device *, | ||
| 35 | const struct component_master_ops *, struct component_match *); | ||
| 36 | void component_match_add(struct device *, struct component_match **, | ||
| 37 | int (*compare)(struct device *, void *), void *compare_data); | ||
| 38 | |||
| 32 | #endif | 39 | #endif |