diff options
| author | Simon Horman <horms+renesas@verge.net.au> | 2013-03-13 22:45:39 +0900 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2013-03-13 22:45:39 +0900 |
| commit | a9324f6b8394ef514098ded280e7017b4204fb90 (patch) | |
| tree | 2cdc1a102d39052ba0e2f7f2a2a756499c07c586 /include/linux | |
| parent | 44e9ac45754a182e8121bf137368452365d4cc4b (diff) | |
| parent | ee341a99de7386434a0d5cf4bc4329c3ab972a13 (diff) | |
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl into pinmux
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/pinctrl/pinctrl.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/pinctrl/pinctrl.h b/include/linux/pinctrl/pinctrl.h index 778804df293f..2c2a9e8d8578 100644 --- a/include/linux/pinctrl/pinctrl.h +++ b/include/linux/pinctrl/pinctrl.h @@ -118,9 +118,9 @@ struct pinctrl_desc { const char *name; struct pinctrl_pin_desc const *pins; unsigned int npins; - struct pinctrl_ops *pctlops; - struct pinmux_ops *pmxops; - struct pinconf_ops *confops; + const struct pinctrl_ops *pctlops; + const struct pinmux_ops *pmxops; + const struct pinconf_ops *confops; struct module *owner; }; |