Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux

[platform/adaptation/renesas_rcar/renesas_kernel.git] / include / linux / platform_device.h

diff --git a/include/linux/platform_device.h b/include/linux/platform_device.h
index 3413897..ce8e4ff 100644 (file)
--- a/include/linux/platform_device.h
+++ b/include/linux/platform_device.h
@@ -183,7 +183,13 @@ struct platform_driver {
 #define to_platform_driver(drv)        (container_of((drv), struct platform_driver, \
                                 driver))
 
-extern int platform_driver_register(struct platform_driver *);
+/*
+ * use a macro to avoid include chaining to get THIS_MODULE
+ */
+#define platform_driver_register(drv) \
+       __platform_driver_register(drv, THIS_MODULE)
+extern int __platform_driver_register(struct platform_driver *,
+                                       struct module *);
 extern void platform_driver_unregister(struct platform_driver *);
 
 /* non-hotpluggable platform devices may use this so that probe() and