diff options
| author |   Simon Horman <horms+renesas@verge.net.au> | 2013-10-08 10:01:47 +0900 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2013-10-08 10:01:47 +0900 |
| commit | 661a7335c4e47726df1e7264580209847509569a (patch) | |
| tree | 9f86456e42fd13c3b82f630e6319faa3e6146732 /arch/arm/mach-shmobile/board-armadillo800eva.c | |
| parent | Merge branch 'heads/soc2' into boards2-base (diff) | |
| parent | ARM: shmobile: r8a7791 SMP support (diff) | |
| download | linux-dev-661a7335c4e47726df1e7264580209847509569a.tar.xz linux-dev-661a7335c4e47726df1e7264580209847509569a.zip | |
Merge branch 'heads/soc2' into boards2-base
Conflicts:
arch/arm/mach-shmobile/board-lager.c
Diffstat (limited to 'arch/arm/mach-shmobile/board-armadillo800eva.c')
| -rw-r--r-- | arch/arm/mach-shmobile/board-armadillo800eva.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c index fc8f9f85d86d..8bc8e4c58847 100644 --- a/arch/arm/mach-shmobile/board-armadillo800eva.c +++ b/arch/arm/mach-shmobile/board-armadillo800eva.c @@ -1109,9 +1109,9 @@ static const struct pinctrl_map eva_pinctrl_map[] = { PIN_MAP_MUX_GROUP_DEFAULT("asoc-simple-card.1", "pfc-r8a7740", "fsib_mclk_in", "fsib"), /* GETHER */ - PIN_MAP_MUX_GROUP_DEFAULT("sh-eth", "pfc-r8a7740", + PIN_MAP_MUX_GROUP_DEFAULT("r8a7740-gether", "pfc-r8a7740", "gether_mii", "gether"), - PIN_MAP_MUX_GROUP_DEFAULT("sh-eth", "pfc-r8a7740", + PIN_MAP_MUX_GROUP_DEFAULT("r8a7740-gether", "pfc-r8a7740", "gether_int", "gether"), /* HDMI */ PIN_MAP_MUX_GROUP_DEFAULT("sh-mobile-hdmi", "pfc-r8a7740", |