diff options
| author | Simon Horman <horms+renesas@verge.net.au> | 2013-03-18 16:26:33 +0400 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2013-03-18 16:26:33 +0400 |
| commit | a9cc2c88aa9514296f868c9ea740b8addc7b8115 (patch) | |
| tree | 9168ea663b74a64b16ee972583905d788131e393 /include/linux | |
| parent | d75bc78b508d0a95d7738290d8ec9923691f4301 (diff) | |
| parent | a4339a9cb46644e19278e4dd5d89b262a37cb0b0 (diff) | |
| download | linux-a9cc2c88aa9514296f868c9ea740b8addc7b8115.tar.xz | |
Merge branches 'soc' and 'pinmux' into boards-base
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; }; |