From 85850e94c1b42b7ff8e2e8361bd538a4628c1939 Mon Sep 17 00:00:00 2001
From: Linus Walleij <linus.walleij@linaro.org>
Date: Tue, 6 Mar 2012 13:52:22 +0100
Subject: [PATCH] --- yaml --- r: 294095 b: refs/heads/master c:
 872acc322c74bb06b7ceb61fe93314e2da32362c h: refs/heads/master i:   294093:
 e54dd5b0e560ecc3804a73f0d7b969c3540491c5   294091:
 1fe292809c392efd24de067e739429200b517783   294087:
 f0c182daa16f893a23beb2549dfe992788c25819   294079:
 2121bf9206a925d86bb45bfed2e210cb079e0704 v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/pinctrl/core.h | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3cea43a89e26..cad8261f59be 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ba110d90c08d9676370db9a62792f57ade5b3bbf
+refs/heads/master: 872acc322c74bb06b7ceb61fe93314e2da32362c
diff --git a/trunk/drivers/pinctrl/core.h b/trunk/drivers/pinctrl/core.h
index 5b3ff134d6db..efbfb62ab147 100644
--- a/trunk/drivers/pinctrl/core.h
+++ b/trunk/drivers/pinctrl/core.h
@@ -12,6 +12,7 @@
 #include <linux/mutex.h>
 #include <linux/radix-tree.h>
 #include <linux/pinctrl/pinconf.h>
+#include <linux/pinctrl/machine.h>
 
 struct pinctrl_gpio_range;
 
@@ -96,7 +97,7 @@ struct pinctrl_setting_configs {
 };
 
 /**
- * struct pinctrl_setting - an individual mux setting
+ * struct pinctrl_setting - an individual mux or config setting
  * @node: list node for struct pinctrl_settings's @settings field
  * @type: the type of setting
  * @pctldev: pin control device handling to be programmed