diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2020-01-02 11:37:44 +0300 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2020-01-02 12:02:45 +0300 |
| commit | 1c467212ab62a0abd18b73eb1f7436a9fa4eed4e (patch) | |
| tree | e5355caf5b3d07df7ea640a1f004d5bbc1fa3ad8 /include/linux | |
| parent | f17b898009d8c979340ff9b68bee1232f00d1d42 (diff) | |
| parent | c72bed23b9e45accdeab626cf2cb2bd08d846f3e (diff) | |
| download | linux-1c467212ab62a0abd18b73eb1f7436a9fa4eed4e.tar.xz | |
Merge branch 'ib-pinctrl-unreg-mappings' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl into drm-intel-next-queued
Merge pincntrl to unblock further i915 changes on top by Hans.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
From: Linus Walleij <linus.walleij@linaro.org>
Link: http://lore.kernel.org/r/CACRpkdaXFSJVkWJGzsVcvbUA9gpgP0Vbkwf1H-HWw8s35R9XYQ@mail.gmail.com
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/pinctrl/machine.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/pinctrl/machine.h b/include/linux/pinctrl/machine.h index ddd1b2773431..e987dc9fd2af 100644 --- a/include/linux/pinctrl/machine.h +++ b/include/linux/pinctrl/machine.h @@ -153,6 +153,7 @@ struct pinctrl_map { extern int pinctrl_register_mappings(const struct pinctrl_map *map, unsigned num_maps); +extern void pinctrl_unregister_mappings(const struct pinctrl_map *map); extern void pinctrl_provide_dummies(void); #else @@ -162,6 +163,10 @@ static inline int pinctrl_register_mappings(const struct pinctrl_map *map, return 0; } +static inline void pinctrl_unregister_mappings(const struct pinctrl_map *map) +{ +} + static inline void pinctrl_provide_dummies(void) { } |