[PATCH 1/1] pinctrl: fix pinctrl_register_mappings

[PATCH 1/1] pinctrl: fix pinctrl_register_mappings

[Jean-Christophe PLAGNIOL-VILLARD]

the function was to pinctrl

e93bcee00c4 pinctrl: move generic functions to the pinctrl_ namespace

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Stephen Warren <swarren@wwwdotorg.org>
---
 include/linux/pinctrl/machine.h |   13 +------------
 1 files changed, 1 insertions(+), 12 deletions(-)

diff --git a/include/linux/pinctrl/machine.h b/include/linux/pinctrl/machine.h
index fee4349..fb6b649 100644
--- a/include/linux/pinctrl/machine.h
+++ b/include/linux/pinctrl/machine.h
@@ -148,18 +148,7 @@ struct pinctrl_map {
 #define PIN_MAP_CONFIGS_GROUP_HOG_DEFAULT(dev, grp, cfgs)		\
 	PIN_MAP_CONFIGS_GROUP(dev, PINCTRL_STATE_DEFAULT, dev, grp, cfgs)
 
-#ifdef CONFIG_PINMUX
-
-extern int pinctrl_register_mappings(struct pinctrl_map const *map,
+extern int pinctrl_register_mappings(struct pinctrl_map const *maps,
 				unsigned num_maps);
 
-#else
-
-static inline int pinctrl_register_mappings(struct pinctrl_map const *map,
-					   unsigned num_maps)
-{
-	return 0;
-}
-
-#endif /* !CONFIG_PINMUX */
 #endif
-- 
1.7.9.1

[PATCH 1/1] pinctrl: fix pinctrl_register_mappings

[Linus Walleij]

On Tue, Apr 24, 2012 at 8:59 AM, Jean-Christophe PLAGNIOL-VILLARD
<plagnioj@jcrosoft.com> wrote:

> the function was to pinctrl
>
> e93bcee00c4 pinctrl: move generic functions to the pinctrl_ namespace
>
> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> Cc: Linus Walleij <linus.walleij@linaro.org>
> Cc: Stephen Warren <swarren@wwwdotorg.org>

This is already fixed in the tree I think, but thanks anyway!

-#endif /* !CONFIG_PINMUX */

We forgot to fix that comment though. I'll write a patch.

Thanks,
Linus Walleij