diff for duplicates of <1350641736-18192-4-git-send-email-hechtb@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 8dfd6bc..92de31e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -141,7 +141,7 @@ index 6dc0369..d51e3c1 100644 + + /* parse user defined options */ + ret = of_get_nand_bus_width(dn); -+ if (ret == 16) ++ if (ret = 16) + pdata->flcmncr_val |= SEL_16BIT; + else if (ret != 8) { + dev_err(dev, "%s: invalid bus width\n", __func__); @@ -167,7 +167,7 @@ index 6dc0369..d51e3c1 100644 int irq; - - pdata = pdev->dev.platform_data; -- if (pdata == NULL) { +- if (pdata = NULL) { - dev_err(&pdev->dev, "no platform data defined\n"); - return -EINVAL; - } diff --git a/a/content_digest b/N1/content_digest index 1a2c16f..9ff099e 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,14 +1,8 @@ "ref\01350641736-18192-1-git-send-email-hechtb@gmail.com\0" "From\0Bastian Hecht <hechtb@googlemail.com>\0" "Subject\0[PATCH v3 3/3] mtd: sh_flctl: Add device tree support\0" - "Date\0Fri, 19 Oct 2012 12:15:36 +0200\0" - "To\0linux-mtd@lists.infradead.org\0" - "Cc\0linux-sh@vger.kernel.org" - Vikram Narayanan <vikram186@gmail.com> - Artem Bityutskiy <dedekind1@gmail.com> - Magnus Damm <magnus.damm@gmail.com> - Guennadi Liakhovetski <g.liakhovetski@gmx.de> - " linux-arm-kernel@lists.infradead.org\0" + "Date\0Fri, 19 Oct 2012 10:15:36 +0000\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "The flctl can now be probed via device tree setup in addition to the\n" @@ -154,7 +148,7 @@ "+\n" "+\t/* parse user defined options */\n" "+\tret = of_get_nand_bus_width(dn);\n" - "+\tif (ret == 16)\n" + "+\tif (ret = 16)\n" "+\t\tpdata->flcmncr_val |= SEL_16BIT;\n" "+\telse if (ret != 8) {\n" "+\t\tdev_err(dev, \"%s: invalid bus width\\n\", __func__);\n" @@ -180,7 +174,7 @@ " \tint irq;\n" "-\n" "-\tpdata = pdev->dev.platform_data;\n" - "-\tif (pdata == NULL) {\n" + "-\tif (pdata = NULL) {\n" "-\t\tdev_err(&pdev->dev, \"no platform data defined\\n\");\n" "-\t\treturn -EINVAL;\n" "-\t}\n" @@ -235,4 +229,4 @@ "-- \n" 1.7.9.5 -5675454f58c93c345a52de707befd20b57c0ccf2e860d0f402a04b2a0afe3cd9 +747be2829f048aff05665342bcc4a1e41f88a3015faec025a9dc6e1407469f65
diff --git a/a/1.txt b/N2/1.txt index 8dfd6bc..4fd5928 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -45,7 +45,7 @@ index 0000000..427f46d + +Example: + -+ flctl@e6a30000 { ++ flctl at e6a30000 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "renesas,shmobile-flctl-sh7372"; @@ -58,17 +58,17 @@ index 0000000..427f46d + &dmac 2;> /* data_rx */ + dma-names = "data_tx", "data_rx"; + -+ system@0 { ++ system at 0 { + label = "system"; + reg = <0x0 0x8000000>; + }; + -+ userdata@8000000 { ++ userdata at 8000000 { + label = "userdata"; + reg = <0x8000000 0x10000000>; + }; + -+ cache@18000000 { ++ cache at 18000000 { + label = "cache"; + reg = <0x18000000 0x8000000>; + }; diff --git a/a/content_digest b/N2/content_digest index 1a2c16f..6fdad18 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,14 +1,8 @@ "ref\01350641736-18192-1-git-send-email-hechtb@gmail.com\0" - "From\0Bastian Hecht <hechtb@googlemail.com>\0" + "From\0hechtb@googlemail.com (Bastian Hecht)\0" "Subject\0[PATCH v3 3/3] mtd: sh_flctl: Add device tree support\0" "Date\0Fri, 19 Oct 2012 12:15:36 +0200\0" - "To\0linux-mtd@lists.infradead.org\0" - "Cc\0linux-sh@vger.kernel.org" - Vikram Narayanan <vikram186@gmail.com> - Artem Bityutskiy <dedekind1@gmail.com> - Magnus Damm <magnus.damm@gmail.com> - Guennadi Liakhovetski <g.liakhovetski@gmx.de> - " linux-arm-kernel@lists.infradead.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "The flctl can now be probed via device tree setup in addition to the\n" @@ -58,7 +52,7 @@ "+\n" "+Example:\n" "+\n" - "+\tflctl@e6a30000 {\n" + "+\tflctl at e6a30000 {\n" "+\t\t#address-cells = <1>;\n" "+\t\t#size-cells = <1>;\n" "+\t\tcompatible = \"renesas,shmobile-flctl-sh7372\";\n" @@ -71,17 +65,17 @@ "+\t\t\t&dmac 2;> /* data_rx */\n" "+\t\tdma-names = \"data_tx\", \"data_rx\";\n" "+\n" - "+\t\tsystem@0 {\n" + "+\t\tsystem at 0 {\n" "+\t\t\tlabel = \"system\";\n" "+\t\t\treg = <0x0 0x8000000>;\n" "+\t\t};\n" "+\n" - "+\t\tuserdata@8000000 {\n" + "+\t\tuserdata at 8000000 {\n" "+\t\t\tlabel = \"userdata\";\n" "+\t\t\treg = <0x8000000 0x10000000>;\n" "+\t\t};\n" "+\n" - "+\t\tcache@18000000 {\n" + "+\t\tcache at 18000000 {\n" "+\t\t\tlabel = \"cache\";\n" "+\t\t\treg = <0x18000000 0x8000000>;\n" "+\t\t};\n" @@ -235,4 +229,4 @@ "-- \n" 1.7.9.5 -5675454f58c93c345a52de707befd20b57c0ccf2e860d0f402a04b2a0afe3cd9 +b4348f177191fc23ea96f1832bb5b41af8167ca9d08e3cacad0229fd7695e521
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.