summaryrefslogtreecommitdiffstats
path: root/drivers/pinctrl
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-04-11 10:29:58 -0700
committerOlof Johansson <olof@lixom.net>2013-04-11 10:30:28 -0700
commit432b473419d9833ff9c48c768f2c8de35185609e (patch)
tree56b46bd299499418ba57fc63d99d141cf2f9f621 /drivers/pinctrl
parent9df00f634a44a0191dcf992a944527a220a5baad (diff)
parent407cd59798ff3ee2b3acdc149adf1f10fe8a098c (diff)
downloadop-kernel-dev-432b473419d9833ff9c48c768f2c8de35185609e.zip
op-kernel-dev-432b473419d9833ff9c48c768f2c8de35185609e.tar.gz
Merge tag 'renesas-pinmux-fixes-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc2
From Simon Horman: Renesas ARM and SH based SoC pinmux fixes for v3.10 Correct a typo in sh-pfc r8a7779 * tag 'renesas-pinmux-fixes-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: sh-pfc: r8a7779: tidyup intc_irq3_b typo Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/pinctrl')
-rw-r--r--drivers/pinctrl/sh-pfc/pfc-r8a7779.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7779.c b/drivers/pinctrl/sh-pfc/pfc-r8a7779.c
index 62dcdcd..791a671 100644
--- a/drivers/pinctrl/sh-pfc/pfc-r8a7779.c
+++ b/drivers/pinctrl/sh-pfc/pfc-r8a7779.c
@@ -2552,7 +2552,7 @@ static const char * const intc_groups[] = {
"intc_irq2",
"intc_irq2_b",
"intc_irq3",
- "intc_irq4_b",
+ "intc_irq3_b",
};
static const char * const lbsc_groups[] = {
OpenPOWER on IntegriCloud