diff for duplicates of <20100311180459.4824.89079.stgit@angua> diff --git a/a/content_digest b/N1/content_digest index f6c49a4..958dec2 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -10,7 +10,20 @@ sfr@canb.auug.org.au jgarzik@pobox.com ben-linux@fluff.org - " dwmw2@infrade\0" + dwmw2@infradead.org + jeremy.kerr@canonical.com + James.Bottomley@suse.de + broonie@opensource.wolfsonmicro.com + microblaze-uclinux@itee.uq.edu.au + linux-kernel@vger.kernel.org + linuxppc-dev@ozlabs.org + sparclinux@vger.kernel.org + linux-ide@vger.kernel.org + netdev@vger.kernel.org + linux-i2c@vger.kernel.org + devicetree-discuss@lists.ozlabs.org + linux-scsi@vger.kernel.org + " alsa-devel@alsa-project.org\0" "\00:1\0" "b\0" ".node is being removed\n" @@ -155,4 +168,4 @@ " \t/* Add the driver */\n" " \treturn i2c_add_driver(&therm_pm72_driver);" -0ddb89ed92dcf171ad815efe7ff65ed613dca0e80f8e678b3d222a7bd296af27 +f934aeb4682b1157377ef371e2002d279c85c6729d9a2276b762a4f75360003d
diff --git a/a/1.txt b/N2/1.txt index 3220454..5e94811 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -114,9 +114,9 @@ index 93fb320..6a715d0 100644 /* Get i2s-a node */ - while ((i2s = of_get_next_child(mdev->ofdev.node, i2s)) != NULL) + while ((i2s = of_get_next_child(mdev->ofdev.dev.of_node, i2s)) != NULL) - if (strcmp(i2s->name, "i2s-a") == 0) + if (strcmp(i2s->name, "i2s-a") = 0) break; - if (i2s == NULL) { + if (i2s = NULL) { @@ -430,7 +430,7 @@ static int __devinit rackmeter_probe(struct macio_dev* mdev, of_address_to_resource(i2s, 1, &rdma)) { printk(KERN_ERR diff --git a/a/content_digest b/N2/content_digest index f6c49a4..26f45fd 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,7 +1,7 @@ "ref\020100311174830.4824.19820.stgit@angua\0" "From\0Grant Likely <grant.likely@secretlab.ca>\0" - "Subject\0[PATCH 13/37] drivers/macintosh: use .dev.of_node instead of .node in struct of_device\0" - "Date\0Thu, 11 Mar 2010 11:04:59 -0700\0" + "Subject\0[PATCH 13/37] drivers/macintosh: use .dev.of_node instead of .node in\0" + "Date\0Thu, 11 Mar 2010 18:04:59 +0000\0" "To\0monstr@monstr.eu" gregkh@suse.de benh@kernel.crashing.org @@ -129,9 +129,9 @@ " \t/* Get i2s-a node */\n" "-\twhile ((i2s = of_get_next_child(mdev->ofdev.node, i2s)) != NULL)\n" "+\twhile ((i2s = of_get_next_child(mdev->ofdev.dev.of_node, i2s)) != NULL)\n" - " \t if (strcmp(i2s->name, \"i2s-a\") == 0)\n" + " \t if (strcmp(i2s->name, \"i2s-a\") = 0)\n" " \t\t break;\n" - " \tif (i2s == NULL) {\n" + " \tif (i2s = NULL) {\n" "@@ -430,7 +430,7 @@ static int __devinit rackmeter_probe(struct macio_dev* mdev,\n" " \t of_address_to_resource(i2s, 1, &rdma)) {\n" " \t\tprintk(KERN_ERR\n" @@ -155,4 +155,4 @@ " \t/* Add the driver */\n" " \treturn i2c_add_driver(&therm_pm72_driver);" -0ddb89ed92dcf171ad815efe7ff65ed613dca0e80f8e678b3d222a7bd296af27 +1d34c83a8d7900ec972f4b1d5d4ad0f881c643802cf4357e74ce4beb271fbe54
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.