diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-09-09 22:50:22 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-09-09 22:50:22 +0800 |
| commit | b71d24fd9283d80a2ca7b26cdd5de296b17de72c (patch) | |
| tree | df2f40632cc6fcb5229e6764b5ef8416786cfa4a /drivers/of/of_private.h | |
| parent | f2725fa609772c64440e3fbd48209a0646e29035 (diff) | |
| parent | 57dad0b2f6693c01240772222c120516d5cd9d8a (diff) | |
Merge tag 'v4.1.31-rt35' into linux-linaro-lsk-v4.1-rt
Linux 4.1.31-rt35
Conflicts:
skip pagevec_add(pvec, page) in __lru_cache_add in mm/swap.c
Diffstat (limited to 'drivers/of/of_private.h')
| -rw-r--r-- | drivers/of/of_private.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/of/of_private.h b/drivers/of/of_private.h index 8e882e706cd8..46ddbee22ce3 100644 --- a/drivers/of/of_private.h +++ b/drivers/of/of_private.h @@ -81,6 +81,9 @@ extern int __of_attach_node_sysfs(struct device_node *np); extern void __of_detach_node(struct device_node *np); extern void __of_detach_node_sysfs(struct device_node *np); +extern void __of_sysfs_remove_bin_file(struct device_node *np, + struct property *prop); + /* iterators for transactions, used for overlays */ /* forward iterator */ #define for_each_transaction_entry(_oft, _te) \ |