From 3627b8601f40984e98d48d48bf3430b38a339091 Mon Sep 17 00:00:00 2001
From: Haojian Zhuang <haojian.zhuang@linaro.org>
Date: Fri, 18 Jan 2013 15:31:06 +0800
Subject: [PATCH] --- yaml --- r: 350487 b: refs/heads/master c:
 d6e99abb424a916ecbb127dba065a379b460a062 h: refs/heads/master i:   350485:
 6581d6ec7fbefeab58fb29278e3639a080335f6a   350483:
 065258ff31604ea21e1be401505c13a4f89c3ba4   350479:
 d128fce730fa669268a1dcc3f0c7850a39f4d224 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/pinctrl/core.c          | 6 ++++++
 trunk/include/linux/pinctrl/pinctrl.h | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 77201b9ff496..625f9ed368b0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 32e67eee670e1254ee5ab41e2f454680acb9c17c
+refs/heads/master: d6e99abb424a916ecbb127dba065a379b460a062
diff --git a/trunk/drivers/pinctrl/core.c b/trunk/drivers/pinctrl/core.c
index 361175372598..e6373f30aeeb 100644
--- a/trunk/drivers/pinctrl/core.c
+++ b/trunk/drivers/pinctrl/core.c
@@ -83,6 +83,12 @@ const char *pinctrl_dev_get_name(struct pinctrl_dev *pctldev)
 }
 EXPORT_SYMBOL_GPL(pinctrl_dev_get_name);
 
+const char *pinctrl_dev_get_devname(struct pinctrl_dev *pctldev)
+{
+	return dev_name(pctldev->dev);
+}
+EXPORT_SYMBOL_GPL(pinctrl_dev_get_devname);
+
 void *pinctrl_dev_get_drvdata(struct pinctrl_dev *pctldev)
 {
 	return pctldev->driver_data;
diff --git a/trunk/include/linux/pinctrl/pinctrl.h b/trunk/include/linux/pinctrl/pinctrl.h
index 04d6700d99af..778804df293f 100644
--- a/trunk/include/linux/pinctrl/pinctrl.h
+++ b/trunk/include/linux/pinctrl/pinctrl.h
@@ -154,6 +154,7 @@ struct pinctrl_dev *of_pinctrl_get(struct device_node *np)
 #endif /* CONFIG_OF */
 
 extern const char *pinctrl_dev_get_name(struct pinctrl_dev *pctldev);
+extern const char *pinctrl_dev_get_devname(struct pinctrl_dev *pctldev);
 extern void *pinctrl_dev_get_drvdata(struct pinctrl_dev *pctldev);
 #else