diff for duplicates of <20130329080021.15748.19258.sendpatchset@w520> diff --git a/a/1.txt b/N1/1.txt index 2263379..42192b3 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -28,12 +28,12 @@ Signed-off-by: Magnus Damm <damm@opensource.se> + bootargs = "console=ttySC0,115200 ignore_loglevel root=/dev/nfs ip=dhcp"; }; - memory@40000000 { + memory at 40000000 { @@ -24,8 +24,29 @@ reg = <0 0x40000000 0 0x40000000>; }; -+ ape6evm_fixed_3v3: fixedregulator@0 { ++ ape6evm_fixed_3v3: fixedregulator at 0 { + compatible = "regulator-fixed"; + regulator-name = "3V3"; + regulator-min-microvolt = <3300000>; @@ -45,7 +45,7 @@ Signed-off-by: Magnus Damm <damm@opensource.se> #address-cells = <1>; #size-cells = <1>; + -+ ethernet@8000000 { ++ ethernet at 8000000 { + compatible = "smsc,lan9118", "smsc,lan9115"; + reg = <0x08000000 0x1000>; + interrupt-parent = <&irqc1>; diff --git a/a/content_digest b/N1/content_digest index 089c55b..bb16698 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020130329075952.15748.6290.sendpatchset@w520\0" - "From\0Magnus Damm <magnus.damm@gmail.com>\0" + "From\0magnus.damm@gmail.com (Magnus Damm)\0" "Subject\0[PATCH 03/03 v3] ARM: shmobile: APE6EVM LAN9220 support\0" - "Date\0Fri, 29 Mar 2013 07:54:27 +0000\0" + "Date\0Fri, 29 Mar 2013 17:00:21 +0900\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -35,12 +35,12 @@ "+\t\tbootargs = \"console=ttySC0,115200 ignore_loglevel root=/dev/nfs ip=dhcp\";\n" " \t};\n" " \n" - " \tmemory@40000000 {\n" + " \tmemory at 40000000 {\n" "@@ -24,8 +24,29 @@\n" " \t\treg = <0 0x40000000 0 0x40000000>;\n" " \t};\n" " \n" - "+\tape6evm_fixed_3v3: fixedregulator@0 {\n" + "+\tape6evm_fixed_3v3: fixedregulator at 0 {\n" "+\t\tcompatible = \"regulator-fixed\";\n" "+\t\tregulator-name = \"3V3\";\n" "+\t\tregulator-min-microvolt = <3300000>;\n" @@ -52,7 +52,7 @@ " \t\t#address-cells = <1>;\n" " \t\t#size-cells = <1>;\n" "+\n" - "+\t\tethernet@8000000 {\n" + "+\t\tethernet at 8000000 {\n" "+\t\t\tcompatible = \"smsc,lan9118\", \"smsc,lan9115\";\n" "+\t\t\treg = <0x08000000 0x1000>;\n" "+\t\t\tinterrupt-parent = <&irqc1>;\n" @@ -135,4 +135,4 @@ " \n" static const char *ape6evm_boards_compat_dt[] __initdata = { -f91e148d33296afb3ba1716305cbd63127c1f3a05c78b19207d3adcc2daefbde +3cefbf0a838fdf9c008d5b79c04fe3ff5db1be721f8f2e2ae04e1c849a376a11
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.