From d7901201f4e1ba76359a53d5cb53d1e543eb9ba4 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Mon, 12 Nov 2012 10:01:56 +0800 Subject: [PATCH] --- yaml --- r: 336411 b: refs/heads/master c: 90db8a145c3aa5a14fda6c587e53d7f15070b4ab h: refs/heads/master i: 336409: 720184664c2d7b00d06b4e21837436ee3be78294 336407: 1c291033bd9cd3bfbb7b835cb6312387c3a82a4a v: v3 --- [refs] | 2 +- trunk/drivers/pinctrl/Kconfig | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index a55b86623ac5..f9fa3936b1ea 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9b2b1740e316a3e114974ffeb73b0ff630061b94 +refs/heads/master: 90db8a145c3aa5a14fda6c587e53d7f15070b4ab diff --git a/trunk/drivers/pinctrl/Kconfig b/trunk/drivers/pinctrl/Kconfig index 6d5a50bcabe6..a274f073abd7 100644 --- a/trunk/drivers/pinctrl/Kconfig +++ b/trunk/drivers/pinctrl/Kconfig @@ -100,17 +100,15 @@ config PINCTRL_MMP2 config PINCTRL_MXS bool + select PINMUX + select PINCONF config PINCTRL_IMX23 bool - select PINMUX - select PINCONF select PINCTRL_MXS config PINCTRL_IMX28 bool - select PINMUX - select PINCONF select PINCTRL_MXS config PINCTRL_NOMADIK