diff --git a/[refs] b/[refs]
index d7d60db9763d..11182e2096cd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1a78958dc212f3698fdc543857af80155cb30f7f
+refs/heads/master: 55d2e40d4acf9081daee5a95d0eb474511408968
diff --git a/trunk/drivers/pinctrl/Kconfig b/trunk/drivers/pinctrl/Kconfig
index d96caefd914a..2cc8fd929d90 100644
--- a/trunk/drivers/pinctrl/Kconfig
+++ b/trunk/drivers/pinctrl/Kconfig
@@ -188,9 +188,10 @@ config PINCTRL_EXYNOS4
 	depends on OF && GPIOLIB
 	select PINCTRL_SAMSUNG
 
+if PLAT_ORION
+
 config PINCTRL_MVEBU
 	bool
-	depends on ARCH_MVEBU
 	select PINMUX
 	select PINCONF
 
@@ -210,6 +211,8 @@ config PINCTRL_ARMADA_XP
 	bool
 	select PINCTRL_MVEBU
 
+endif
+
 source "drivers/pinctrl/spear/Kconfig"
 
 config PINCTRL_XWAY