diff options
| author | Olof Johansson <olof@lixom.net> | 2013-04-11 13:29:58 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-04-11 13:30:28 -0400 |
| commit | 432b473419d9833ff9c48c768f2c8de35185609e (patch) | |
| tree | 56b46bd299499418ba57fc63d99d141cf2f9f621 /drivers/pinctrl | |
| parent | 9df00f634a44a0191dcf992a944527a220a5baad (diff) | |
| parent | 407cd59798ff3ee2b3acdc149adf1f10fe8a098c (diff) | |
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.c | 2 |
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 62dcdcdec940..791a6719d8a9 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[] = { | |||
| 2552 | "intc_irq2", | 2552 | "intc_irq2", |
| 2553 | "intc_irq2_b", | 2553 | "intc_irq2_b", |
| 2554 | "intc_irq3", | 2554 | "intc_irq3", |
| 2555 | "intc_irq4_b", | 2555 | "intc_irq3_b", |
| 2556 | }; | 2556 | }; |
| 2557 | 2557 | ||
| 2558 | static const char * const lbsc_groups[] = { | 2558 | static const char * const lbsc_groups[] = { |