diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-07 18:41:23 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-07 18:41:23 -0700 |
| commit | 4aa42291b00ea3963c88d38c32293a1856534976 (patch) | |
| tree | 8616039e88569ca5c1fe6be4c3c7a44830e26bc6 /include | |
| parent | c1a567d31b5488f4593eae7ca215264947b355ca (diff) | |
| parent | 9e5e2ffda320bacb761e4812e3ef7a7decd592a9 (diff) | |
Merge branch 'component-for-staging' of git://ftp.arm.linux.org.uk/~rmk/linux-arm into staging-next
Russell writes:
This updates imx-drm for the recently merged updates to the component
helper, and as such is based upon the previously pulled updates
(including the recent fix) into the the driver tree.
Diffstat (limited to 'include')
| -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 *, int component_master_add_child(struct master *master, int (*compare)(struct device *, void *), void *compare_data); +struct component_match; + +int component_master_add_with_match(struct device *, + const struct component_master_ops *, struct component_match *); +void component_match_add(struct device *, struct component_match **, + int (*compare)(struct device *, void *), void *compare_data); + #endif |