diff options
| author | Michal Marek <mmarek@suse.cz> | 2010-12-01 07:13:56 -0500 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2010-12-01 07:13:56 -0500 |
| commit | 307991055b0ce65d53dc1eb501c456c10eb36360 (patch) | |
| tree | 71bb9263dc71344e5d7b97ca6d5cf223f1f1a856 /include/linux/usb.h | |
| parent | 1198c6d45a1ef5f4f7fdfbf33ef7d270493ec575 (diff) | |
| parent | 9b4320b77bab4031649c484da1c595f39c2e43cd (diff) | |
Merge branch 'kconfig_fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-next into kbuild/rc-fixes
Diffstat (limited to 'include/linux/usb.h')
| -rw-r--r-- | include/linux/usb.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/usb.h b/include/linux/usb.h index 35fe6ab222bb..24300d8a1bc1 100644 --- a/include/linux/usb.h +++ b/include/linux/usb.h | |||
| @@ -797,7 +797,7 @@ struct usbdrv_wrap { | |||
| 797 | * @disconnect: Called when the interface is no longer accessible, usually | 797 | * @disconnect: Called when the interface is no longer accessible, usually |
| 798 | * because its device has been (or is being) disconnected or the | 798 | * because its device has been (or is being) disconnected or the |
| 799 | * driver module is being unloaded. | 799 | * driver module is being unloaded. |
| 800 | * @ioctl: Used for drivers that want to talk to userspace through | 800 | * @unlocked_ioctl: Used for drivers that want to talk to userspace through |
| 801 | * the "usbfs" filesystem. This lets devices provide ways to | 801 | * the "usbfs" filesystem. This lets devices provide ways to |
| 802 | * expose information to user space regardless of where they | 802 | * expose information to user space regardless of where they |
| 803 | * do (or don't) show up otherwise in the filesystem. | 803 | * do (or don't) show up otherwise in the filesystem. |