diff for duplicates of <1435332210.23818.10.camel@codethink.co.uk> diff --git a/a/1.txt b/N1/1.txt index 14656cd..232c828 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -58,8 +58,7 @@ index 22a5470889f5..38be7cbea4ca 100644 + PORT_GP_32(3, PIN_LOW_VOLTAGE, unused), + + /* Pins not associated with a GPIO port, placed after all the GPIOs */ -+ [RCAR_GP_PIN(5, 31) + 1] = - SH_PFC_PIN_NAMED(ROW_GROUP_A('F'), 15, AF15), ++ [RCAR_GP_PIN(5, 31) + 1] SH_PFC_PIN_NAMED(ROW_GROUP_A('F'), 15, AF15), SH_PFC_PIN_NAMED(ROW_GROUP_A('G'), 15, AG15), SH_PFC_PIN_NAMED(ROW_GROUP_A('H'), 15, AH15), @@ -4595,6 +4605,55 @@ static const char * const vin3_groups[] = { diff --git a/a/content_digest b/N1/content_digest index 9e6b8b5..2b17699 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\01435332116.23818.7.camel@codethink.co.uk\0" "From\0Ben Hutchings <ben.hutchings@codethink.co.uk>\0" "Subject\0[PATCH v3 3/6] pinctrl: sh-pfc: r8a7790: Implement voltage switching for SDHI\0" - "Date\0Fri, 26 Jun 2015 16:23:30 +0100\0" + "Date\0Fri, 26 Jun 2015 15:23:30 +0000\0" "To\0Ian Molton <ian@mnementh.co.uk>" " Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" "Cc\0linux-mmc@vger.kernel.org" @@ -73,8 +73,7 @@ "+\tPORT_GP_32(3, PIN_LOW_VOLTAGE, unused),\n" "+\n" "+\t/* Pins not associated with a GPIO port, placed after all the GPIOs */\n" - "+\t[RCAR_GP_PIN(5, 31) + 1] =\n" - " \tSH_PFC_PIN_NAMED(ROW_GROUP_A('F'), 15, AF15),\n" + "+\t[RCAR_GP_PIN(5, 31) + 1] \tSH_PFC_PIN_NAMED(ROW_GROUP_A('F'), 15, AF15),\n" " \tSH_PFC_PIN_NAMED(ROW_GROUP_A('G'), 15, AG15),\n" " \tSH_PFC_PIN_NAMED(ROW_GROUP_A('H'), 15, AH15),\n" "@@ -4595,6 +4605,55 @@ static const char * const vin3_groups[] = {\n" @@ -151,4 +150,4 @@ "-- \n" 2.1.4 -f30751bd604482c43e64a8f5906ac35ed69c9dda128138663e16e7337520dbd4 +b8d667ec40d6a8a651381535f1211bbc00149e782e05d00c25fa61c843bd0ea6
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.