diff options
| author | Vishal Bhoj <vishal.bhoj@linaro.org> | 2014-06-02 11:20:28 +0530 |
|---|---|---|
| committer | Vishal Bhoj <vishal.bhoj@linaro.org> | 2014-06-02 11:20:28 +0530 |
| commit | d0fc6571e7c769847836aad3071a3b21a820eae5 (patch) | |
| tree | 2c3f69540a367929200c47bf024ecc5ae2a17dbb /arch/arm/cpu/armv7/rmobile/pfc-r8a7791.c | |
| parent | 3fa3bdcfdcb724087762c9dcf6b48e2525bbd6ff (diff) | |
| parent | 90b51c33f362926e17d4c07dcef1ce822abaa89f (diff) | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'arch/arm/cpu/armv7/rmobile/pfc-r8a7791.c')
| -rw-r--r-- | arch/arm/cpu/armv7/rmobile/pfc-r8a7791.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv7/rmobile/pfc-r8a7791.c b/arch/arm/cpu/armv7/rmobile/pfc-r8a7791.c index f49f990a0..46d6e60c1 100644 --- a/arch/arm/cpu/armv7/rmobile/pfc-r8a7791.c +++ b/arch/arm/cpu/armv7/rmobile/pfc-r8a7791.c @@ -913,7 +913,7 @@ static struct pinmux_cfg_reg pinmux_config_regs[] = { /* SEL_SCIF3 [2] */ FN_SEL_SCIF3_0, FN_SEL_SCIF3_1, FN_SEL_SCIF3_2, FN_SEL_SCIF3_3, /* SEL_IEB [2] */ - FN_SEL_IEB_0, FN_SEL_IEB_1, FN_SEL_IEB_2, + FN_SEL_IEB_0, FN_SEL_IEB_1, FN_SEL_IEB_2, 0, /* SEL_MMC [1] */ FN_SEL_MMC_0, FN_SEL_MMC_1, /* SEL_SCIF5 [1] */ |