The following commit has been merged in the linux branch: commit 99b830aa553668a2c433e4cbff130224a75c74bb Author: David Vrabel david.vrabel@csr.com Date: Mon Oct 12 15:45:13 2009 +0000

USB: rename Documentation/ABI/.../sysfs-class-usb_host

The usb_host class is no more. Rename its documentation file (which only contained WUSB specific files) to .../sysfs-class-uwb_rc-wusbhc.

Signed-off-by: David Vrabel david.vrabel@csr.com Signed-off-by: Greg Kroah-Hartman gregkh@suse.de

diff --git a/Documentation/ABI/testing/sysfs-class-usb_host b/Documentation/ABI/testing/sysfs-class-uwb_rc-wusbhc similarity index 88% rename from Documentation/ABI/testing/sysfs-class-usb_host rename to Documentation/ABI/testing/sysfs-class-uwb_rc-wusbhc index 46b66ad..4e8106f 100644 --- a/Documentation/ABI/testing/sysfs-class-usb_host +++ b/Documentation/ABI/testing/sysfs-class-uwb_rc-wusbhc @@ -1,4 +1,4 @@ -What: /sys/class/usb_host/usb_hostN/wusb_chid +What: /sys/class/uwb_rc/uwbN/wusbhc/wusb_chid Date: July 2008 KernelVersion: 2.6.27 Contact: David Vrabel david.vrabel@csr.com @@ -9,7 +9,7 @@ Description:

Set an all zero CHID to stop the host controller.

-What: /sys/class/usb_host/usb_hostN/wusb_trust_timeout +What: /sys/class/uwb_rc/uwbN/wusbhc/wusb_trust_timeout Date: July 2008 KernelVersion: 2.6.27 Contact: David Vrabel david.vrabel@csr.com