diff for duplicates of <20100311180543.4824.70491.stgit@angua> diff --git a/a/content_digest b/N1/content_digest index 89183c0..c066497 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "ref\020100311174830.4824.19820.stgit@angua\0" "From\0Grant Likely <grant.likely@secretlab.ca>\0" - "Subject\0[PATCH 21/37] drivers/ata: use .dev.of_node instead of .node in\tstruct of_device\0" + "Subject\0[PATCH 21/37] drivers/ata: use .dev.of_node instead of .node in struct of_device\0" "Date\0Thu, 11 Mar 2010 11:05:44 -0700\0" "To\0monstr@monstr.eu" gregkh@suse.de @@ -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" @@ -99,4 +112,4 @@ " \t\t\tpmif->dma_regs = ioremap(macio_resource_start(mdev, 1), 0x1000);\n" " \t} else" -78862f5d16d581cdf951ba69f549f42705e78ea59a91ce753bfe365106901025 +c3cbd27449617489c431e5b92144d8202c8801462d45d35a744d1e47eebcf6b4
diff --git a/a/1.txt b/N2/1.txt index f69bc5c..c272198 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -40,7 +40,7 @@ index 850ee45..9697de9 100644 +++ b/drivers/ide/pmac.c @@ -1152,7 +1152,7 @@ pmac_ide_macio_attach(struct macio_dev *mdev, const struct of_device_id *match) - if (macio_resource_count(mdev) == 0) { + if (macio_resource_count(mdev) = 0) { printk(KERN_WARNING "ide-pmac: no address for %s\n", - mdev->ofdev.node->full_name); + mdev->ofdev.dev.of_node->full_name); @@ -58,7 +58,7 @@ index 850ee45..9697de9 100644 } @@ -1172,7 +1172,7 @@ pmac_ide_macio_attach(struct macio_dev *mdev, const struct of_device_id *match) */ - if (macio_irq_count(mdev) == 0) { + if (macio_irq_count(mdev) = 0) { printk(KERN_WARNING "ide-pmac: no intrs for device %s, using " - "13\n", mdev->ofdev.node->full_name); + "13\n", mdev->ofdev.dev.of_node->full_name); diff --git a/a/content_digest b/N2/content_digest index 89183c0..9a9a0ca 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 21/37] drivers/ata: use .dev.of_node instead of .node in\tstruct of_device\0" - "Date\0Thu, 11 Mar 2010 11:05:44 -0700\0" + "Subject\0[PATCH 21/37] drivers/ata: use .dev.of_node instead of .node in\0" + "Date\0Thu, 11 Mar 2010 18:05:44 +0000\0" "To\0monstr@monstr.eu" gregkh@suse.de benh@kernel.crashing.org @@ -55,7 +55,7 @@ "+++ b/drivers/ide/pmac.c\n" "@@ -1152,7 +1152,7 @@ pmac_ide_macio_attach(struct macio_dev *mdev, const struct of_device_id *match)\n" " \n" - " \tif (macio_resource_count(mdev) == 0) {\n" + " \tif (macio_resource_count(mdev) = 0) {\n" " \t\tprintk(KERN_WARNING \"ide-pmac: no address for %s\\n\",\n" "-\t\t\t\t mdev->ofdev.node->full_name);\n" "+\t\t\t\t mdev->ofdev.dev.of_node->full_name);\n" @@ -73,7 +73,7 @@ " \t}\n" "@@ -1172,7 +1172,7 @@ pmac_ide_macio_attach(struct macio_dev *mdev, const struct of_device_id *match)\n" " \t */\n" - " \tif (macio_irq_count(mdev) == 0) {\n" + " \tif (macio_irq_count(mdev) = 0) {\n" " \t\tprintk(KERN_WARNING \"ide-pmac: no intrs for device %s, using \"\n" "-\t\t\t\t \"13\\n\", mdev->ofdev.node->full_name);\n" "+\t\t\t\t \"13\\n\", mdev->ofdev.dev.of_node->full_name);\n" @@ -99,4 +99,4 @@ " \t\t\tpmif->dma_regs = ioremap(macio_resource_start(mdev, 1), 0x1000);\n" " \t} else" -78862f5d16d581cdf951ba69f549f42705e78ea59a91ce753bfe365106901025 +d14be7cec4a26f1cf8cb933a020cedd995e89e6b9125b032d54f0e7de57506b6
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.