From 1c291033bd9cd3bfbb7b835cb6312387c3a82a4a Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Wed, 7 Nov 2012 23:57:59 +0800
Subject: [PATCH] --- yaml --- r: 336407 b: refs/heads/master c:
 5c084ec82015553ab8972cd251fc2e5757e4a379 h: refs/heads/master i:   336405:
 472986b114f8eaaedeab97dd2cce49cb2b5a66ec   336403:
 d86f4265c3b77bf48d08fdc704c78627e6b2b10f   336399:
 fe33efcaccdac46abdb11b12a6d579367f5f24d1 v: v3

---
 [refs]                                 |  2 +-
 trunk/drivers/pinctrl/pinctrl-lantiq.c | 11 -----------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 1778b6c6ce8d..b30fe9883f0a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 826d6ca8f955c7a902e775acef3bdbfc93695b04
+refs/heads/master: 5c084ec82015553ab8972cd251fc2e5757e4a379
diff --git a/trunk/drivers/pinctrl/pinctrl-lantiq.c b/trunk/drivers/pinctrl/pinctrl-lantiq.c
index 07ba7682cf22..d670ad6e6e49 100644
--- a/trunk/drivers/pinctrl/pinctrl-lantiq.c
+++ b/trunk/drivers/pinctrl/pinctrl-lantiq.c
@@ -275,16 +275,6 @@ static int ltq_pmx_enable(struct pinctrl_dev *pctrldev,
 	return 0;
 }
 
-static void ltq_pmx_disable(struct pinctrl_dev *pctrldev,
-				unsigned func,
-				unsigned group)
-{
-	/*
-	 * Nothing to do here. However, pinconf_check_ops() requires this
-	 * callback to be defined.
-	 */
-}
-
 static int ltq_pmx_gpio_request_enable(struct pinctrl_dev *pctrldev,
 				struct pinctrl_gpio_range *range,
 				unsigned pin)
@@ -312,7 +302,6 @@ static struct pinmux_ops ltq_pmx_ops = {
 	.get_function_name	= ltq_pmx_func_name,
 	.get_function_groups	= ltq_pmx_get_groups,
 	.enable			= ltq_pmx_enable,
-	.disable		= ltq_pmx_disable,
 	.gpio_request_enable	= ltq_pmx_gpio_request_enable,
 };