X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fpowerpc%2Fkernel%2Fof_device.c;fp=arch%2Fpowerpc%2Fkernel%2Fof_device.c;h=22d83d4d1af5f6ce33d3ba0b9cce8b26ed30b1e8;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=3262b73a3a6898e926e33b5f3d97e97c3943e684;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/arch/powerpc/kernel/of_device.c b/arch/powerpc/kernel/of_device.c
index 3262b73a3..22d83d4d1 100644
--- a/arch/powerpc/kernel/of_device.c
+++ b/arch/powerpc/kernel/of_device.c
@@ -1,3 +1,4 @@
+#include <linux/config.h>
 #include <linux/string.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
@@ -146,12 +147,15 @@ postcore_initcall(of_bus_driver_init);
 
 int of_register_driver(struct of_platform_driver *drv)
 {
+	int count = 0;
+
 	/* initialize common driver fields */
 	drv->driver.name = drv->name;
 	drv->driver.bus = &of_platform_bus_type;
 
 	/* register with core */
-	return driver_register(&drv->driver);
+	count = driver_register(&drv->driver);
+	return count ? count : 1;
 }
 
 void of_unregister_driver(struct of_platform_driver *drv)