History

Merge branch 'ib-pinctrl-unreg-mappings' into devel

Linus Walleij committed 6 years ago

Commit d77552d2 parents e5399ab c72bed25 files · +24 −32Browse files

Showing the changes to include/linux (1 of 5 files). Show all

Unified · Split

include/linux/pinctrl/machine.h+5−0
@@ -153,6 +153,7 @@ struct pinctrl_map { · 152 unmodified lines
153 153
154extern int pinctrl_register_mappings(const struct pinctrl_map *map,154extern int pinctrl_register_mappings(const struct pinctrl_map *map,
155 unsigned num_maps);155 unsigned num_maps);
156extern void pinctrl_unregister_mappings(const struct pinctrl_map *map);
156extern void pinctrl_provide_dummies(void);157extern void pinctrl_provide_dummies(void);
157#else158#else
158 159
@@ -162,6 +163,10 @@ static inline int pinctrl_register_mappings(const struct pinctrl_map *map, · 3 unmodified lines
162 return 0;163 return 0;
163}164}
164 165
166static inline void pinctrl_unregister_mappings(const struct pinctrl_map *map)
167{
168}
169
165static inline void pinctrl_provide_dummies(void)170static inline void pinctrl_provide_dummies(void)
166{171{
167}172}