forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6

Browse source 
Trivial manual merge fixup for usb_find_interface clashes.
This commit is contained in:
Linus Torvalds 2006-01-04 18:44:12 -08:00
commit db9edfd7e3
64 changed files with 878 additions and 823 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/linux/usb.h
View file

@ -225,7 +225,7 @@ struct usb_interface_cache {
* Device drivers should not attempt to activate configurations. The choice
* of which configuration to install is a policy decision based on such
* considerations as available power, functionality provided, and the user's
* desires (expressed through hotplug scripts). However, drivers can call
* desires (expressed through userspace tools). However, drivers can call
* usb_reset_configuration() to reinitialize the current configuration and
* all its interfaces.
*/