diff for duplicates of <20100311182259.13103.87535.stgit@angua> diff --git a/a/content_digest b/N1/content_digest index b52b320..ca2d4d1 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 13/27] drivers/net/of: don't use deprecated field in\tof_platform_driver\0" + "Subject\0[PATCH 13/27] drivers/net/of: don't use deprecated field in of_platform_driver\0" "Date\0Thu, 11 Mar 2010 11:23:00 -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" @@ -483,4 +496,4 @@ " \t.remove\t\t= __devexit_p(xemaclite_of_remove),\n" }; -1939691f5a47c7f84eb023d6a2a1dd5651e8ae2533c3225cc368e74265bac957 +ac5882bdea23c52f8e4bbffb774208e8312d00246e9deb7527d4ad7062f5a263
diff --git a/a/1.txt b/N2/1.txt index fd56b99..b6697a7 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -196,8 +196,7 @@ diff --git a/drivers/net/ibm_newemac/core.c b/drivers/net/ibm_newemac/core.c index bad72ba..19b9e60 100644 --- a/drivers/net/ibm_newemac/core.c +++ b/drivers/net/ibm_newemac/core.c -@@ -2995,9 +2995,11 @@ static struct of_device_id emac_match[] = - MODULE_DEVICE_TABLE(of, emac_match); +@@ -2995,9 +2995,11 @@ static struct of_device_id emac_match[] MODULE_DEVICE_TABLE(of, emac_match); static struct of_platform_driver emac_driver = { - .name = "emac", @@ -215,8 +214,7 @@ diff --git a/drivers/net/ibm_newemac/mal.c b/drivers/net/ibm_newemac/mal.c index 29ed695..dad3572 100644 --- a/drivers/net/ibm_newemac/mal.c +++ b/drivers/net/ibm_newemac/mal.c -@@ -789,9 +789,11 @@ static struct of_device_id mal_platform_match[] = - }; +@@ -789,9 +789,11 @@ static struct of_device_id mal_platform_match[] }; static struct of_platform_driver mal_of_driver = { - .name = "mcmal", @@ -234,8 +232,7 @@ diff --git a/drivers/net/ibm_newemac/rgmii.c b/drivers/net/ibm_newemac/rgmii.c index 57fc784..666d4f4 100644 --- a/drivers/net/ibm_newemac/rgmii.c +++ b/drivers/net/ibm_newemac/rgmii.c -@@ -318,9 +318,11 @@ static struct of_device_id rgmii_match[] = - }; +@@ -318,9 +318,11 @@ static struct of_device_id rgmii_match[] }; static struct of_platform_driver rgmii_driver = { - .name = "emac-rgmii", @@ -253,8 +250,7 @@ diff --git a/drivers/net/ibm_newemac/tah.c b/drivers/net/ibm_newemac/tah.c index 4f64b00..0446371 100644 --- a/drivers/net/ibm_newemac/tah.c +++ b/drivers/net/ibm_newemac/tah.c -@@ -166,9 +166,11 @@ static struct of_device_id tah_match[] = - }; +@@ -166,9 +166,11 @@ static struct of_device_id tah_match[] }; static struct of_platform_driver tah_driver = { - .name = "emac-tah", @@ -272,8 +268,7 @@ diff --git a/drivers/net/ibm_newemac/zmii.c b/drivers/net/ibm_newemac/zmii.c index 724e00e..c9e7eb7 100644 --- a/drivers/net/ibm_newemac/zmii.c +++ b/drivers/net/ibm_newemac/zmii.c -@@ -312,9 +312,11 @@ static struct of_device_id zmii_match[] = - }; +@@ -312,9 +312,11 @@ static struct of_device_id zmii_match[] }; static struct of_platform_driver zmii_driver = { - .name = "emac-zmii", diff --git a/a/content_digest b/N2/content_digest index b52b320..d7c6fab 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 13/27] drivers/net/of: don't use deprecated field in\tof_platform_driver\0" - "Date\0Thu, 11 Mar 2010 11:23:00 -0700\0" + "Subject\0[PATCH 13/27] drivers/net/of: don't use deprecated field in\0" + "Date\0Thu, 11 Mar 2010 18:23:00 +0000\0" "To\0monstr@monstr.eu" gregkh@suse.de benh@kernel.crashing.org @@ -211,8 +211,7 @@ "index bad72ba..19b9e60 100644\n" "--- a/drivers/net/ibm_newemac/core.c\n" "+++ b/drivers/net/ibm_newemac/core.c\n" - "@@ -2995,9 +2995,11 @@ static struct of_device_id emac_match[] =\n" - " MODULE_DEVICE_TABLE(of, emac_match);\n" + "@@ -2995,9 +2995,11 @@ static struct of_device_id emac_match[] MODULE_DEVICE_TABLE(of, emac_match);\n" " \n" " static struct of_platform_driver emac_driver = {\n" "-\t.name = \"emac\",\n" @@ -230,8 +229,7 @@ "index 29ed695..dad3572 100644\n" "--- a/drivers/net/ibm_newemac/mal.c\n" "+++ b/drivers/net/ibm_newemac/mal.c\n" - "@@ -789,9 +789,11 @@ static struct of_device_id mal_platform_match[] =\n" - " };\n" + "@@ -789,9 +789,11 @@ static struct of_device_id mal_platform_match[] };\n" " \n" " static struct of_platform_driver mal_of_driver = {\n" "-\t.name = \"mcmal\",\n" @@ -249,8 +247,7 @@ "index 57fc784..666d4f4 100644\n" "--- a/drivers/net/ibm_newemac/rgmii.c\n" "+++ b/drivers/net/ibm_newemac/rgmii.c\n" - "@@ -318,9 +318,11 @@ static struct of_device_id rgmii_match[] =\n" - " };\n" + "@@ -318,9 +318,11 @@ static struct of_device_id rgmii_match[] };\n" " \n" " static struct of_platform_driver rgmii_driver = {\n" "-\t.name = \"emac-rgmii\",\n" @@ -268,8 +265,7 @@ "index 4f64b00..0446371 100644\n" "--- a/drivers/net/ibm_newemac/tah.c\n" "+++ b/drivers/net/ibm_newemac/tah.c\n" - "@@ -166,9 +166,11 @@ static struct of_device_id tah_match[] =\n" - " };\n" + "@@ -166,9 +166,11 @@ static struct of_device_id tah_match[] };\n" " \n" " static struct of_platform_driver tah_driver = {\n" "-\t.name = \"emac-tah\",\n" @@ -287,8 +283,7 @@ "index 724e00e..c9e7eb7 100644\n" "--- a/drivers/net/ibm_newemac/zmii.c\n" "+++ b/drivers/net/ibm_newemac/zmii.c\n" - "@@ -312,9 +312,11 @@ static struct of_device_id zmii_match[] =\n" - " };\n" + "@@ -312,9 +312,11 @@ static struct of_device_id zmii_match[] };\n" " \n" " static struct of_platform_driver zmii_driver = {\n" "-\t.name = \"emac-zmii\",\n" @@ -483,4 +478,4 @@ " \t.remove\t\t= __devexit_p(xemaclite_of_remove),\n" }; -1939691f5a47c7f84eb023d6a2a1dd5651e8ae2533c3225cc368e74265bac957 +a49c9d0299235e88b2c0cdef199f96ef071559b79173606ef06d46d8f635146f
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.