From 625ef91ae1330c3cbb0150f7e6793d72114a62de Mon Sep 17 00:00:00 2001
From: Shawn Guo <shawn.guo@linaro.org>
Date: Mon, 13 Aug 2012 19:55:37 +0800
Subject: [PATCH] --- yaml --- r: 326782 b: refs/heads/master c:
 b6798f88bc1458eb7ab671b874880fd7ba77cfb4 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/arch/arm/mach-imx/Kconfig    | 2 ++
 trunk/arch/arm/mach-imx/imx51-dt.c | 3 ---
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index ec7df7d86aac..4da8e91ddefe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b72cf10578651411143b0ef21bfe0b6ffc921aa2
+refs/heads/master: b6798f88bc1458eb7ab671b874880fd7ba77cfb4
diff --git a/trunk/arch/arm/mach-imx/Kconfig b/trunk/arch/arm/mach-imx/Kconfig
index 374fcc256d43..7ca5fe45945f 100644
--- a/trunk/arch/arm/mach-imx/Kconfig
+++ b/trunk/arch/arm/mach-imx/Kconfig
@@ -101,6 +101,8 @@ config	SOC_IMX51
 	select SOC_IMX5
 	select ARCH_MX5
 	select ARCH_MX51
+	select PINCTRL
+	select PINCTRL_IMX51
 
 if ARCH_IMX_V4_V5
 
diff --git a/trunk/arch/arm/mach-imx/imx51-dt.c b/trunk/arch/arm/mach-imx/imx51-dt.c
index 8604165b2a57..306cddca6c7c 100644
--- a/trunk/arch/arm/mach-imx/imx51-dt.c
+++ b/trunk/arch/arm/mach-imx/imx51-dt.c
@@ -13,7 +13,6 @@
 #include <linux/irq.h>
 #include <linux/of_irq.h>
 #include <linux/of_platform.h>
-#include <linux/pinctrl/machine.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/time.h>
 #include <mach/common.h>
@@ -55,8 +54,6 @@ static void __init imx51_dt_init(void)
 	const struct of_device_id *of_id;
 	void (*func)(void);
 
-	pinctrl_provide_dummies();
-
 	node = of_find_matching_node(NULL, imx51_iomuxc_of_match);
 	if (node) {
 		of_id = of_match_node(imx51_iomuxc_of_match, node);