From 90091e6771ac99ee6ab61d5ff45fc2c3e3a45a49 Mon Sep 17 00:00:00 2001
From: Shawn Guo <shawn.guo@linaro.org>
Date: Sat, 11 Aug 2012 22:33:48 +0800
Subject: [PATCH] --- yaml --- r: 326772 b: refs/heads/master c:
 d9d253a498a60043b5f63ff7b4060ef6553f24d9 h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/arch/arm/mach-imx/mach-imx6q.c | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 3197dd453845..c670d1725448 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 497ae1747b8c52fde4ab7e9987326ca43886b652
+refs/heads/master: d9d253a498a60043b5f63ff7b4060ef6553f24d9
diff --git a/trunk/arch/arm/mach-imx/mach-imx6q.c b/trunk/arch/arm/mach-imx/mach-imx6q.c
index 7a9599fcbf82..263bc9148183 100644
--- a/trunk/arch/arm/mach-imx/mach-imx6q.c
+++ b/trunk/arch/arm/mach-imx/mach-imx6q.c
@@ -22,7 +22,6 @@
 #include <linux/of_address.h>
 #include <linux/of_irq.h>
 #include <linux/of_platform.h>
-#include <linux/pinctrl/machine.h>
 #include <linux/phy.h>
 #include <linux/micrel_phy.h>
 #include <linux/mfd/anatop.h>
@@ -159,12 +158,6 @@ static void __init imx6q_usb_init(void)
 
 static void __init imx6q_init_machine(void)
 {
-	/*
-	 * This should be removed when all imx6q boards have pinctrl
-	 * states for devices defined in device tree.
-	 */
-	pinctrl_provide_dummies();
-
 	if (of_machine_is_compatible("fsl,imx6q-sabrelite"))
 		imx6q_sabrelite_init();