diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-03-21 18:11:13 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-03-21 18:11:13 +0100 |
| commit | 8f07b1d580fdbbc21969319d4208a15f5280d04e (patch) | |
| tree | 5fcbae26b297bfe4abc428c1a6814e0ac1753bcc /include/linux | |
| parent | f6161aa153581da4a3867a2d1a7caf4be19b6ec9 (diff) | |
| parent | 48296a13e7f411402f080d0603724623fa3eee14 (diff) | |
Merge tag 'renesas-boards-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards
From Simon Horman <horms+renesas@verge.net.au>:
Renesas ARM-based SoC board updates for v3.10
This is based on a merge of the following:
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git renesas-pinmux-for-v3.10
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git renesas-soc-for-v3.10
* tag 'renesas-boards-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: (218 commits)
ARM: shmobile: kzm9g: correct smsc regulator registration
ARM: shmobile: marzen: Use gic_iid macro for ICCIAR / interrupt ID
ARM: shmobile: kzm9g: Trim reference DT_MACHINE_START
ARM: shmobile: kzm9g: Remove warning about SMP
ARM: shmobile: simplify kzm9g Kconfig dependencies
ARM: shmobile: SDHI and MMCIF interfaces to kzm9g-reference
ARM: shmobile: parse DT and configure pinmux early on kzm9g-reference
ARM: shmobile: kzm9g: Reference DT implementation
ARM: shmobile: marzen: Reference DT implementation
ARM: shmobile: mark mackerel sh_mmcif_device __maybe_unused
ARM: shmobile: streamline mackerel SD and MMC devices
ARM: shmobile: switch SDHI0 to GPIO regulator on armadillo800eva
ARM: shmobile: use GPIO SD-card detection on armadillo800eva
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
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; }; |