diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-07 22:22:26 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-07 22:22:26 -0500 |
commit | f2aca47dc3c2d0c2d5dbd972558557e74232bbce (patch) | |
tree | eae58f599a25a1f3ab41bf616a2b7c4b3c6e2277 /include/linux/usb.h | |
parent | 7677ced48e2bbbb8d847d34f37e5d96d2b0e41e4 (diff) | |
parent | b592fcfe7f06c15ec11774b5be7ce0de3aa86e73 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6: (28 commits)
sysfs: Shadow directory support
Driver Core: Increase the default timeout value of the firmware subsystem
Driver core: allow to delay the uevent at device creation time
Driver core: add device_type to struct device
Driver core: add uevent vars for devices of a class
SYSFS: Fix missing include of list.h in sysfs.h
HOWTO: Add a reference to Harbison and Steele
sysfs: error handling in sysfs, fill_read_buffer()
kobject: kobject_put cleanup
sysfs: kobject_put cleanup
sysfs: suppress lockdep warnings
Driver core: fix race in sysfs between sysfs_remove_file() and read()/write()
driver core: Change function call order in device_bind_driver().
driver core: Don't stop probing on ->probe errors.
driver core fixes: device_register() retval check in platform.c
driver core fixes: make_class_name() retval checks
/sys/modules/*/holders
USB: add the sysfs driver name to all modules
SERIO: add the sysfs driver name to all modules
PCI: add the sysfs driver name to all modules
...
Diffstat (limited to 'include/linux/usb.h')
-rw-r--r-- | include/linux/usb.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/usb.h b/include/linux/usb.h index aab5b1b72021..733f38de4978 100644 --- a/include/linux/usb.h +++ b/include/linux/usb.h | |||
@@ -868,10 +868,11 @@ struct usb_class_driver { | |||
868 | * use these in module_init()/module_exit() | 868 | * use these in module_init()/module_exit() |
869 | * and don't forget MODULE_DEVICE_TABLE(usb, ...) | 869 | * and don't forget MODULE_DEVICE_TABLE(usb, ...) |
870 | */ | 870 | */ |
871 | extern int usb_register_driver(struct usb_driver *, struct module *); | 871 | extern int usb_register_driver(struct usb_driver *, struct module *, |
872 | const char *); | ||
872 | static inline int usb_register(struct usb_driver *driver) | 873 | static inline int usb_register(struct usb_driver *driver) |
873 | { | 874 | { |
874 | return usb_register_driver(driver, THIS_MODULE); | 875 | return usb_register_driver(driver, THIS_MODULE, KBUILD_MODNAME); |
875 | } | 876 | } |
876 | extern void usb_deregister(struct usb_driver *); | 877 | extern void usb_deregister(struct usb_driver *); |
877 | 878 | ||