Merge remote-tracking branch 'usb-gadget/next'

[deliverable/linux.git] / include / linux / ulpi / driver.h

diff --git a/include/linux/ulpi/driver.h b/include/linux/ulpi/driver.h
index a44408f6d53225a9d497e29804d1d0163f4d59c1..a7af21a5524805b47718ef8001eea20e83860647 100644 (file)
--- a/include/linux/ulpi/driver.h
+++ b/include/linux/ulpi/driver.h
@@ -47,7 +47,11 @@ struct ulpi_driver {
 
 #define to_ulpi_driver(d) container_of(d, struct ulpi_driver, driver)
 
-int ulpi_register_driver(struct ulpi_driver *drv);
+/*
+ * use a macro to avoid include chaining to get THIS_MODULE
+ */
+#define ulpi_register_driver(drv) __ulpi_register_driver(drv, THIS_MODULE)
+int __ulpi_register_driver(struct ulpi_driver *drv, struct module *module);
 void ulpi_unregister_driver(struct ulpi_driver *drv);
 
 #define module_ulpi_driver(__ulpi_driver) \