diff --git a/[refs] b/[refs]
index dbfa4ce7e1ca..638912b030d4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1acbbb4ed846ec6a546834c86a3bd4a5bad4ee4d
+refs/heads/master: e3e79454a7c81a5e48c6d6b31068b12936e7d780
diff --git a/trunk/drivers/sh/pfc/pinctrl.c b/trunk/drivers/sh/pfc/pinctrl.c
index 4eaf24b36a81..e79e379917fc 100644
--- a/trunk/drivers/sh/pfc/pinctrl.c
+++ b/trunk/drivers/sh/pfc/pinctrl.c
@@ -338,6 +338,10 @@ static int __devinit sh_pfc_map_gpios(struct sh_pfc *pfc,
 		pin->number = pfc->first_gpio + i;
 		pin->name = gpio->name;
 
+		/* XXX */
+		if (unlikely(!gpio->enum_id))
+			continue;
+
 		sh_pfc_map_one_gpio(pfc, pmx, gpio, i);
 	}