Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6

[karo-tx-linux.git] / include / linux / usb.h

diff --git a/include/linux/usb.h b/include/linux/usb.h
index 6f49a1b39fa64e3a8224ca1b9312ad7f63aebf54..d3d0c1374334d58c684e5f1b4d13422aa8f57ae8 100644 (file)
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -946,10 +946,11 @@ struct usb_class_driver {
  */
 extern int usb_register_driver(struct usb_driver *, struct module *,
                               const char *);
-static inline int usb_register(struct usb_driver *driver)
-{
-       return usb_register_driver(driver, THIS_MODULE, KBUILD_MODNAME);
-}
+
+/* use a define to avoid include chaining to get THIS_MODULE & friends */
+#define usb_register(driver) \
+       usb_register_driver(driver, THIS_MODULE, KBUILD_MODNAME)
+
 extern void usb_deregister(struct usb_driver *);
 
 extern int usb_register_device_driver(struct usb_device_driver *,