From 73822d45223731c1618c1546116ba7880e55d8b7 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Thu, 7 Mar 2013 13:59:26 +0100 Subject: [PATCH] --- yaml --- r: 372653 b: refs/heads/master c: 9cb5c048ca1139ea6292ea00ee9657cb157cce8b h: refs/heads/master i: 372651: 91f53c0fdee75a692f61dc89aeec9e686742ecdf v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-shmobile/include/mach/r8a7779.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index c9b3df6d6d86..ed70312180e4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 89fd785f2ad74f8b4a658a5b5608a559ac3dcfd5 +refs/heads/master: 9cb5c048ca1139ea6292ea00ee9657cb157cce8b diff --git a/trunk/arch/arm/mach-shmobile/include/mach/r8a7779.h b/trunk/arch/arm/mach-shmobile/include/mach/r8a7779.h index f3ae551bf2b7..e50bf53b0dec 100644 --- a/trunk/arch/arm/mach-shmobile/include/mach/r8a7779.h +++ b/trunk/arch/arm/mach-shmobile/include/mach/r8a7779.h @@ -71,7 +71,7 @@ enum { GPIO_FN_A19, /* IPSR0 */ - GPIO_FN_USB_PENC2, GPIO_FN_PWM1, GPIO_FN_PWMFSW0, + GPIO_FN_PWM1, GPIO_FN_PWMFSW0, GPIO_FN_SCIF_CLK, GPIO_FN_TCLK0_C, GPIO_FN_BS, GPIO_FN_FD2, GPIO_FN_ATADIR0, GPIO_FN_SDSELF, GPIO_FN_HCTS1, GPIO_FN_A0, @@ -191,7 +191,7 @@ enum { GPIO_FN_VI1_FIELD, GPIO_FN_VI3_FIELD, GPIO_FN_AUDIO_CLKOUT, GPIO_FN_GPS_CLK_C, GPIO_FN_GPS_CLK_D, GPIO_FN_AUDIO_CLKA, GPIO_FN_CAN_TXCLK, - GPIO_FN_AUDIO_CLKB, GPIO_FN_USB_OVC2, GPIO_FN_CAN_DEBUGOUT0, + GPIO_FN_AUDIO_CLKB, GPIO_FN_CAN_DEBUGOUT0, GPIO_FN_MOUT0, /* IPSR6 */ @@ -230,10 +230,10 @@ enum { GPIO_FN_DREQ2, GPIO_FN_DACK2, /* IPSR8 */ - GPIO_FN_USB_OVC0, GPIO_FN_AD_CLK, + GPIO_FN_AD_CLK, GPIO_FN_CC5_STATE4, GPIO_FN_CC5_STATE12, GPIO_FN_CC5_STATE20, GPIO_FN_CC5_STATE28, GPIO_FN_CC5_STATE36, - GPIO_FN_USB_OVC1, GPIO_FN_AD_DI, + GPIO_FN_AD_DI, GPIO_FN_CC5_STATE5, GPIO_FN_CC5_STATE13, GPIO_FN_CC5_STATE21, GPIO_FN_CC5_STATE29, GPIO_FN_CC5_STATE37, GPIO_FN_CAN_DEBUG_HW_TRIGGER, GPIO_FN_AD_DO,