diff --git a/[refs] b/[refs] index 02c8639c7caf..b8b49e5f83cc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ceb882ba296438a421a48a1fb833f5099c5fd8d5 +refs/heads/master: f19be10872e9971a1dd2860d575de1a802467e9d diff --git a/trunk/arch/arm/mach-shmobile/include/mach/r8a7779.h b/trunk/arch/arm/mach-shmobile/include/mach/r8a7779.h index 8ab0cd6ad6b0..badba5703f0b 100644 --- a/trunk/arch/arm/mach-shmobile/include/mach/r8a7779.h +++ b/trunk/arch/arm/mach-shmobile/include/mach/r8a7779.h @@ -308,7 +308,7 @@ enum { GPIO_FN_SD2_CD, GPIO_FN_MT0_VCXO, GPIO_FN_SPA_TMS, GPIO_FN_HSPI_TX1_D, GPIO_FN_VI1_DATA7_VI1_B7, GPIO_FN_SD2_WP, GPIO_FN_MT0_PWM, GPIO_FN_SPA_TDI, GPIO_FN_HSPI_RX1_D, GPIO_FN_VI1_G0, GPIO_FN_VI3_DATA0, - GPIO_FN_DU1_DOTCLKOUT1, GPIO_FN_TS_SCK1, GPIO_FN_DREQ2_B, GPIO_FN_TX2, + GPIO_FN_TS_SCK1, GPIO_FN_DREQ2_B, GPIO_FN_TX2, GPIO_FN_SPA_TDO, GPIO_FN_HCTS0_B, GPIO_FN_VI1_G1, GPIO_FN_VI3_DATA1, GPIO_FN_SSI_SCK1, GPIO_FN_TS_SDEN1, GPIO_FN_DACK2_B, GPIO_FN_RX2, GPIO_FN_HRTS0_B,