diff for duplicates of <20131010222049.9063.76211.stgit@localhost> diff --git a/a/1.txt b/N1/1.txt index f57d203..6285d42 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -36,7 +36,7 @@ index 0000000..9c18adf +}; + +&gpmc { -+ ethernet@gpmc { ++ ethernet at gpmc { + compatible = "smsc,lan9221", "smsc,lan9115"; + bank-width = <2>; + gpmc,mux-add-data; @@ -101,8 +101,8 @@ index e8c4828..503d928 100644 }; }; -- ethernet@5,0 { -+ ethernet@gpmc { +- ethernet at 5,0 { ++ ethernet at gpmc { pinctrl-names = "default"; pinctrl-0 = <&smsc911x_pins>; - compatible = "smsc,lan9221", "smsc,lan9115"; diff --git a/a/content_digest b/N1/content_digest index 92cb54f..456852b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,10 +1,8 @@ "ref\020131010221833.9063.49904.stgit@localhost\0" - "From\0Tony Lindgren <tony@atomide.com>\0" + "From\0tony@atomide.com (Tony Lindgren)\0" "Subject\0[PATCH 3/8] ARM: dts: Shared file for omap GPMC connected smsc911x\0" "Date\0Thu, 10 Oct 2013 15:20:49 -0700\0" "To\0linux-arm-kernel@lists.infradead.org\0" - "Cc\0devicetree@vger.kernel.org" - " linux-omap@vger.kernel.org\0" "\00:1\0" "b\0" "Looks like at least Igep, Zoom and EVM boards can use a\n" @@ -45,7 +43,7 @@ "+};\n" "+\n" "+&gpmc {\n" - "+\tethernet@gpmc {\n" + "+\tethernet at gpmc {\n" "+\t\tcompatible = \"smsc,lan9221\", \"smsc,lan9115\";\n" "+\t\tbank-width = <2>;\n" "+\t\tgpmc,mux-add-data;\n" @@ -110,8 +108,8 @@ " \t\t};\n" " \t};\n" " \n" - "-\tethernet@5,0 {\n" - "+\tethernet@gpmc {\n" + "-\tethernet at 5,0 {\n" + "+\tethernet at gpmc {\n" " \t\tpinctrl-names = \"default\";\n" " \t\tpinctrl-0 = <&smsc911x_pins>;\n" "-\t\tcompatible = \"smsc,lan9221\", \"smsc,lan9115\";\n" @@ -150,4 +148,4 @@ " \t};\n" }; -ec081098d5e7c6a8b4dda2540fd312407182c93465352e36075cd3ee404750ca +30c2c845129952a6d23fb131b898b7e1402e7157cdea80b7c62b02a3072385a6
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.