diff --git a/[refs] b/[refs] index eded8a35adba..c90615e2b7ac 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ffa2a9d504b6145cf355a98b686254847d62a9a3 +refs/heads/master: 097eb1c400b56a80e777536bd643185049b6a255 diff --git a/trunk/arch/arm/mach-shmobile/include/mach/sh73a0.h b/trunk/arch/arm/mach-shmobile/include/mach/sh73a0.h index 218e6b78397b..d488e2b26e3f 100644 --- a/trunk/arch/arm/mach-shmobile/include/mach/sh73a0.h +++ b/trunk/arch/arm/mach-shmobile/include/mach/sh73a0.h @@ -94,8 +94,7 @@ enum { GPIO_PORT305, GPIO_PORT306, GPIO_PORT307, GPIO_PORT308, GPIO_PORT309, /* Table 25-1 (Function 0-7) */ - GPIO_FN_VBUS_0 = 310, - GPIO_FN_GPI0, + GPIO_FN_GPI0 = 310, GPIO_FN_GPI1, GPIO_FN_GPI2, GPIO_FN_GPI3,