diff for duplicates of <50D1B4C1.4060502@ti.com> diff --git a/a/1.txt b/N1/1.txt index 151c8cc..58bb9a0 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -11,9 +11,9 @@ On 12/19/2012 10:31 AM, Javier Martinez Canillas wrote: >> >> DTC arch/arm/boot/dts/omap3-igep0020.dtb >> DTC arch/arm/boot/dts/omap3-igep0030.dtb ->> ERROR (duplicate_label): Duplicate label 'vsim' on /ocp/i2c@48070000/twl@48/regulator-vsim and /ocp/i2c@48070000/twl@48/regulator@10 +>> ERROR (duplicate_label): Duplicate label 'vsim' on /ocp/i2c at 48070000/twl at 48/regulator-vsim and /ocp/i2c at 48070000/twl at 48/regulator at 10 >> ERROR: Input tree has errors, aborting (use -f to force output) ->> ERROR (duplicate_label): Duplicate label 'vsim' on /ocp/i2c@48070000/twl@48/regulator-vsim and /ocp/i2c@48070000/twl@48/regulator@10 +>> ERROR (duplicate_label): Duplicate label 'vsim' on /ocp/i2c at 48070000/twl at 48/regulator-vsim and /ocp/i2c at 48070000/twl at 48/regulator at 10 >> ERROR: Input tree has errors, aborting (use -f to force output) >> make[1]: *** [arch/arm/boot/dts/omap3-igep0020.dtb] Error 2 >> make[1]: *** Waiting for unfinished jobs.... @@ -36,7 +36,7 @@ On 12/19/2012 10:31 AM, Javier Martinez Canillas wrote: >> interrupts = <7>; /* SYS_NIRQ cascaded to intc */ >> interrupt-parent = <&intc>; >> ->> - vsim: regulator@10 { +>> - vsim: regulator at 10 { >> - compatible = "ti,twl4030-vsim"; >> - regulator-min-microvolt = <1800000>; >> - regulator-max-microvolt = <3000000>; diff --git a/a/content_digest b/N1/content_digest index c68ee5a..effa685 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,18 +1,9 @@ "ref\01355532740-5956-1-git-send-email-javier.martinez@collabora.co.uk\0" "ref\0CAAwP0s2oJCcvCgQ6UrcnLJpt7K7AdHhVWGOthhgc4v9AgmaHEQ@mail.gmail.com\0" - "From\0Benoit Cousson <b-cousson@ti.com>\0" - "Subject\0Re: [PATCH 1/1] ARM: dts: omap3-igep: remove VSIM regulator\0" + "From\0b-cousson@ti.com (Benoit Cousson)\0" + "Subject\0[PATCH 1/1] ARM: dts: omap3-igep: remove VSIM regulator\0" "Date\0Wed, 19 Dec 2012 13:36:17 +0100\0" - "To\0Javier Martinez Canillas <martinez.javier@gmail.com>\0" - "Cc\0Tony Lindgren <tony@atomide.com>" - grant.likely@secretlab.ca - Enric Balletbo i Serra <eballetbo@gmail.com> - Ezequiel Garcia <elezegarcia@gmail.com> - Jon Hunter <jon-hunter@ti.com> - Matthias Brugger <matthias.bgg@googlemail.com> - linux-omap@vger.kernel.org - linux-arm-kernel@lists.infradead.org - " Javier Martinez Canillas <javier.martinez@collabora.co.uk>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Hi Javier,\n" @@ -28,9 +19,9 @@ ">>\n" ">> DTC arch/arm/boot/dts/omap3-igep0020.dtb\n" ">> DTC arch/arm/boot/dts/omap3-igep0030.dtb\n" - ">> ERROR (duplicate_label): Duplicate label 'vsim' on /ocp/i2c@48070000/twl@48/regulator-vsim and /ocp/i2c@48070000/twl@48/regulator@10\n" + ">> ERROR (duplicate_label): Duplicate label 'vsim' on /ocp/i2c at 48070000/twl at 48/regulator-vsim and /ocp/i2c at 48070000/twl at 48/regulator at 10\n" ">> ERROR: Input tree has errors, aborting (use -f to force output)\n" - ">> ERROR (duplicate_label): Duplicate label 'vsim' on /ocp/i2c@48070000/twl@48/regulator-vsim and /ocp/i2c@48070000/twl@48/regulator@10\n" + ">> ERROR (duplicate_label): Duplicate label 'vsim' on /ocp/i2c at 48070000/twl at 48/regulator-vsim and /ocp/i2c at 48070000/twl at 48/regulator at 10\n" ">> ERROR: Input tree has errors, aborting (use -f to force output)\n" ">> make[1]: *** [arch/arm/boot/dts/omap3-igep0020.dtb] Error 2\n" ">> make[1]: *** Waiting for unfinished jobs....\n" @@ -53,7 +44,7 @@ ">> interrupts = <7>; /* SYS_NIRQ cascaded to intc */\n" ">> interrupt-parent = <&intc>;\n" ">>\n" - ">> - vsim: regulator@10 {\n" + ">> - vsim: regulator at 10 {\n" ">> - compatible = \"ti,twl4030-vsim\";\n" ">> - regulator-min-microvolt = <1800000>;\n" ">> - regulator-max-microvolt = <3000000>;\n" @@ -75,4 +66,4 @@ "Regards,\n" Benoit -ea4d43b12c13ad9fd56a8c532c626cc859c7e92830301338db55a1f4a496bf01 +8d6f30e272a882f72d34778c48532495c5801d1c87b9332ef8cf726a1736342e
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.