diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2016-05-09 16:32:29 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-05-09 16:32:29 +0200 |
| commit | 1644de03cbc05b70d0283c570b75fe9339b375b7 (patch) | |
| tree | da77c17c775e3fb2138e0c43e3013e8bec6c83a4 /include/linux | |
| parent | Merge tag 'v4.6-next-soc' of https://github.com/mbgg/linux-mediatek into next/drivers (diff) | |
| parent | reset: Add missing function stub for device_reset (diff) | |
Merge tag 'reset-for-4.7-2' of git://git.pengutronix.de/git/pza/linux into next/drivers
Merge "Reset controller changes for v4.7" from Philipp Zabel:
- add missing stub for device_reset
- add support for OXNAS SoCs
* tag 'reset-for-4.7-2' of git://git.pengutronix.de/git/pza/linux:
reset: Add missing function stub for device_reset
dt-bindings: Add Oxford Semiconductor Reset Controller bindings
reset: Add Oxford Semiconductor Reset Controller driver
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/reset.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/reset.h b/include/linux/reset.h index a552134a209e..ec0306ce7b92 100644 --- a/include/linux/reset.h +++ b/include/linux/reset.h @@ -56,6 +56,12 @@ static inline void reset_control_put(struct reset_control *rstc) WARN_ON(1); } +static inline int __must_check device_reset(struct device *dev) +{ + WARN_ON(1); + return -ENOTSUPP; +} + static inline int device_reset_optional(struct device *dev) { return -ENOTSUPP; |