From eb0f37668c48e597b05c5670d38ebe224147cedf Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Wed, 13 Mar 2013 18:53:05 +0100 Subject: [PATCH] --- yaml --- r: 372625 b: refs/heads/master c: f03e4be625c652e12bc14e9f975ebcde9119a762 h: refs/heads/master i: 372623: 6d40077e62410026334605e80161e12af73d5fdb v: v3 --- [refs] | 2 +- trunk/drivers/pinctrl/sh-pfc/pfc-sh73a0.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4b8cb3c985a3..1f4bcbc0924e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0ad6fe53678abf33b6d3d882688d0b82591cbc54 +refs/heads/master: f03e4be625c652e12bc14e9f975ebcde9119a762 diff --git a/trunk/drivers/pinctrl/sh-pfc/pfc-sh73a0.c b/trunk/drivers/pinctrl/sh-pfc/pfc-sh73a0.c index 7b010b6ce44e..273345ceaeec 100644 --- a/trunk/drivers/pinctrl/sh-pfc/pfc-sh73a0.c +++ b/trunk/drivers/pinctrl/sh-pfc/pfc-sh73a0.c @@ -2936,11 +2936,10 @@ static const struct sh_pfc_function pinmux_functions[] = { SH_PFC_FUNCTION(usb), }; -#define PINMUX_FN_BASE GPIO_FN_VBUS_0 +#define PINMUX_FN_BASE GPIO_FN_GPI0 static const struct pinmux_func pinmux_func_gpios[] = { /* Table 25-1 (Functions 0-7) */ - GPIO_FN(VBUS_0), GPIO_FN(GPI0), GPIO_FN(GPI1), GPIO_FN(GPI2),