diff options
| author | Olof Johansson <olof@lixom.net> | 2014-05-26 19:16:17 (GMT) |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-05-26 19:16:17 (GMT) |
| commit | 6580ad3fc1297b63a1248b6f8d6c2fac3d447cd1 (patch) | |
| tree | 526838ffc6d711a7ceaea5509a171b07c332b640 /include | |
| parent | 4b660a7f5c8099d88d1a43d8ae138965112592c7 (diff) | |
| parent | e3ec0a8c6eea4f22d5468f01c065caca4dd1ecca (diff) | |
| download | linux-6580ad3fc1297b63a1248b6f8d6c2fac3d447cd1.tar.xz | |
Merge branch 'reset/fixes' of git://git.pengutronix.de/git/pza/linux into next/fixes-non-critical
Merge a fix from Philipp Zabel:
This patch fixes an erroneous revert that slipped in with commit
b424080a9e086e683ad5fdc624a7cf3c024e0c0f reset: Add optional resets and
stubs.
* 'reset/fixes' of git://git.pengutronix.de/git/pza/linux:
reset: Add of_reset_control_get to reset.h
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/reset.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/linux/reset.h b/include/linux/reset.h index c0eda50..349f150 100644 --- a/include/linux/reset.h +++ b/include/linux/reset.h @@ -2,6 +2,7 @@ #define _LINUX_RESET_H_ struct device; +struct device_node; struct reset_control; #ifdef CONFIG_RESET_CONTROLLER @@ -33,6 +34,9 @@ static inline struct reset_control *devm_reset_control_get_optional( return devm_reset_control_get(dev, id); } +struct reset_control *of_reset_control_get(struct device_node *node, + const char *id); + #else static inline int reset_control_reset(struct reset_control *rstc) @@ -75,6 +79,12 @@ static inline struct reset_control *devm_reset_control_get_optional( return ERR_PTR(-ENOSYS); } +static inline struct reset_control *of_reset_control_get( + struct device_node *node, const char *id) +{ + return ERR_PTR(-ENOSYS); +} + #endif /* CONFIG_RESET_CONTROLLER */ #endif |