diff for duplicates of <20100721233959.7782.17711.stgit@angua> diff --git a/a/1.txt b/N1/1.txt index f242286..ae09ed2 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -119,7 +119,7 @@ index 4e0a2f7..d3497cd 100644 - static int of_dev_node_match(struct device *dev, void *data) { - return to_of_device(dev)->dev.of_node == data; + return to_of_device(dev)->dev.of_node = data; diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c index 5e4d852..ba6fc87 100644 --- a/arch/powerpc/kernel/setup-common.c @@ -400,7 +400,7 @@ index 9d3d932..712dfd8 100644 + * After all of_platform_bus_type drivers are converted to + * platform_drivers, this exception can be removed. + */ -+ if (bus == &platform_bus_type) ++ if (bus = &platform_bus_type) + return of_register_platform_driver(drv); /* register with core */ @@ -412,7 +412,7 @@ index 9d3d932..712dfd8 100644 void of_unregister_driver(struct of_platform_driver *drv) { - driver_unregister(&drv->driver); -+ if (drv->driver.bus == &platform_bus_type) ++ if (drv->driver.bus = &platform_bus_type) + of_unregister_platform_driver(drv); + else + driver_unregister(&drv->driver); diff --git a/a/content_digest b/N1/content_digest index 0ff213a..8d470da 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020100721232817.7782.23410.stgit@angua\0" "From\0Grant Likely <grant.likely@secretlab.ca>\0" "Subject\0[PATCH 2/5] of: Merge of_platform_bus_type with platform_bus_type\0" - "Date\0Wed, 21 Jul 2010 17:40:00 -0600\0" + "Date\0Wed, 21 Jul 2010 23:40:00 +0000\0" "To\0Stephen Rothwell <sfr@canb.auug.org.au>" Michal Simek <monstr@monstr.eu> Benjamin Herrenschmidt <benh@kernel.crashing.org> @@ -134,7 +134,7 @@ "-\n" " static int of_dev_node_match(struct device *dev, void *data)\n" " {\n" - " \treturn to_of_device(dev)->dev.of_node == data;\n" + " \treturn to_of_device(dev)->dev.of_node = data;\n" "diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c\n" "index 5e4d852..ba6fc87 100644\n" "--- a/arch/powerpc/kernel/setup-common.c\n" @@ -415,7 +415,7 @@ "+\t * After all of_platform_bus_type drivers are converted to\n" "+\t * platform_drivers, this exception can be removed.\n" "+\t */\n" - "+\tif (bus == &platform_bus_type)\n" + "+\tif (bus = &platform_bus_type)\n" "+\t\treturn of_register_platform_driver(drv);\n" " \n" " \t/* register with core */\n" @@ -427,7 +427,7 @@ " void of_unregister_driver(struct of_platform_driver *drv)\n" " {\n" "-\tdriver_unregister(&drv->driver);\n" - "+\tif (drv->driver.bus == &platform_bus_type)\n" + "+\tif (drv->driver.bus = &platform_bus_type)\n" "+\t\tof_unregister_platform_driver(drv);\n" "+\telse\n" "+\t\tdriver_unregister(&drv->driver);\n" @@ -515,4 +515,4 @@ " extern struct of_device *of_device_alloc(struct device_node *np,\n" " \t\t\t\t\t const char *bus_id," -32177e72f3ecfba84917b2cbd2abf56fd2d165fe4987d1fa0641259baf64c092 +2f8e9f38f1caa3fca8c0cf834640cc7121a1b9a225787ef1933fb7a0be372939
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.