diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2012-03-06 13:52:22 +0100 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2012-03-06 23:07:41 +0100 |
| commit | 872acc322c74bb06b7ceb61fe93314e2da32362c (patch) | |
| tree | 20d767e7acd064f0db71b1f5aba5567d8f9687df /drivers/pinctrl/core.h | |
| parent | ba110d90c08d9676370db9a62792f57ade5b3bbf (diff) | |
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>
Diffstat (limited to 'drivers/pinctrl/core.h')
| -rw-r--r-- | drivers/pinctrl/core.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/pinctrl/core.h b/drivers/pinctrl/core.h index 5b3ff134d6d..efbfb62ab14 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 |