diff for duplicates of <20100311182253.13103.92479.stgit@angua> diff --git a/a/content_digest b/N1/content_digest index c9fb080..e29b966 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "ref\020100311181604.13103.30088.stgit@angua\0" "From\0Grant Likely <grant.likely@secretlab.ca>\0" - "Subject\0[PATCH 12/27] drivers/mtd/of: don't use deprecated field in\tof_platform_driver\0" + "Subject\0[PATCH 12/27] drivers/mtd/of: don't use deprecated field in of_platform_driver\0" "Date\0Thu, 11 Mar 2010 11:22:54 -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" ".name, .match_table and .owner are duplicated in both of_platform_driver\n" @@ -153,4 +166,4 @@ " \t.remove\t\t= __devexit_p(socrates_nand_remove),\n" }; -ea1b757d7335c1d80eb90e737296ca62bf2e2cfb164e6ea6d060ae1edab7dd2a +f7357082f0378573e88be34b3362a4462720ef72671916f25e4cb6be82c7ffec
diff --git a/a/1.txt b/N2/1.txt index 44f9207..ca10c78 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -107,8 +107,7 @@ index edfc27b..a97e9c9 100644 +++ b/drivers/mtd/nand/pasemi_nand.c @@ -221,8 +221,11 @@ MODULE_DEVICE_TABLE(of, pasemi_nand_match); - static struct of_platform_driver pasemi_nand_driver = - { + static struct of_platform_driver pasemi_nand_driver { - .name = (char*)driver_name, - .match_table = pasemi_nand_match, + .driver = { @@ -123,8 +122,7 @@ diff --git a/drivers/mtd/nand/socrates_nand.c b/drivers/mtd/nand/socrates_nand.c index a4519a7..edb9b13 100644 --- a/drivers/mtd/nand/socrates_nand.c +++ b/drivers/mtd/nand/socrates_nand.c -@@ -301,8 +301,11 @@ static struct of_device_id socrates_nand_match[] = - MODULE_DEVICE_TABLE(of, socrates_nand_match); +@@ -301,8 +301,11 @@ static struct of_device_id socrates_nand_match[] MODULE_DEVICE_TABLE(of, socrates_nand_match); static struct of_platform_driver socrates_nand_driver = { - .name = "socrates_nand", diff --git a/a/content_digest b/N2/content_digest index c9fb080..ab991e2 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,7 +1,7 @@ "ref\020100311181604.13103.30088.stgit@angua\0" "From\0Grant Likely <grant.likely@secretlab.ca>\0" - "Subject\0[PATCH 12/27] drivers/mtd/of: don't use deprecated field in\tof_platform_driver\0" - "Date\0Thu, 11 Mar 2010 11:22:54 -0700\0" + "Subject\0[PATCH 12/27] drivers/mtd/of: don't use deprecated field in\0" + "Date\0Thu, 11 Mar 2010 18:22:54 +0000\0" "To\0monstr@monstr.eu" gregkh@suse.de benh@kernel.crashing.org @@ -122,8 +122,7 @@ "+++ b/drivers/mtd/nand/pasemi_nand.c\n" "@@ -221,8 +221,11 @@ MODULE_DEVICE_TABLE(of, pasemi_nand_match);\n" " \n" - " static struct of_platform_driver pasemi_nand_driver =\n" - " {\n" + " static struct of_platform_driver pasemi_nand_driver {\n" "-\t.name\t\t= (char*)driver_name,\n" "-\t.match_table\t= pasemi_nand_match,\n" "+\t.driver = {\n" @@ -138,8 +137,7 @@ "index a4519a7..edb9b13 100644\n" "--- a/drivers/mtd/nand/socrates_nand.c\n" "+++ b/drivers/mtd/nand/socrates_nand.c\n" - "@@ -301,8 +301,11 @@ static struct of_device_id socrates_nand_match[] =\n" - " MODULE_DEVICE_TABLE(of, socrates_nand_match);\n" + "@@ -301,8 +301,11 @@ static struct of_device_id socrates_nand_match[] MODULE_DEVICE_TABLE(of, socrates_nand_match);\n" " \n" " static struct of_platform_driver socrates_nand_driver = {\n" "-\t.name\t\t= \"socrates_nand\",\n" @@ -153,4 +151,4 @@ " \t.remove\t\t= __devexit_p(socrates_nand_remove),\n" }; -ea1b757d7335c1d80eb90e737296ca62bf2e2cfb164e6ea6d060ae1edab7dd2a +b7b68debdd65713b7fd6cd8f62767f5b9c8e308b3a897cfe815dc8c8fda9b8de
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.