From: Linus Walleij <linus.walleij@linaro.org>
Date: Tue, 6 Mar 2012 12:52:22 +0000 (+0100)
Subject: pinctrl: include machine header to core.h
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=872acc322c74bb06b7ceb61fe93314e2da32362c;p=linux-beck.git

pinctrl: include machine header to core.h

struct pinctrl_setting contains an enum pinctrl_map_type
field, so we need to include machine.h. Also fix kerneldoc
to indicate that the pinctrl_setting is about both muxing
and other config.

Acked-by: Stephen Warren <swarren@wwwdotorg.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---

diff --git a/drivers/pinctrl/core.h b/drivers/pinctrl/core.h
index 5b3ff134d6db..efbfb62ab147 100644
--- a/drivers/pinctrl/core.h
+++ b/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