Hi David,
Today's linux-next merge of the uwb tree got a conflict in
Documentation/ABI/testing/sysfs-bus-usb between commit
0130b0e738ead70618d364339cbe2f7f9f1ee87f ("USB: Export if an interface
driver supports autosuspend") from the usb tree and commit
c8cf2465fcfc16877f4f9e8dccc6b89b543fa2c5 ("uwb: document UWB and WUSB
sysfs files") from the uwb tree.
Just overlapping additions. I fixed it up (see below) and can carry the
fix.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
diff --cc Documentation/ABI/testing/sysfs-bus-usb
index df6c8a0,273a7f0..0000000
--- a/Documentation/ABI/testing/sysfs-bus-usb
+++ b/Documentation/ABI/testing/sysfs-bus-usb
@@@ -86,18 -86,45 +86,61 @@@ Users
PowerTOP <power@xxxxxxxxxxx>
http://www.lesswatts.org/projects/powertop/
+What: /sys/bus/usb/device/<busnum>-<devnum>...:<config num>-<interface num>/supports_autosuspend
+Date: January 2008
+KernelVersion: 2.6.27
+Contact: Sarah Sharp <sarah.a.sharp@xxxxxxxxx>
+Description:
+ When read, this file returns 1 if the interface driver
+ for this interface supports autosuspend. It also
+ returns 1 if no driver has claimed this interface, as an
+ unclaimed interface will not stop the device from being
+ autosuspended if all other interface drivers are idle.
+ The file returns 0 if autosuspend support has not been
+ added to the driver.
+Users:
+ USB PM tool
+ git://git.moblin.org/users/sarah/usb-pm-tool/
++
+ What: /sys/bus/usb/device/.../authorized
+ Date: July 2008
+ KernelVersion: 2.6.26
+ Contact: David Vrabel <david.vrabel@xxxxxxx>
+ Description:
+ Authorized devices are available for use by device
+ drivers, non-authorized one are not. By default, wired
+ USB devices are authorized.
+
+ Certified Wireless USB devices are not authorized
+ initially and should be (by writing 1) after the
+ device has been authenticated.
+
+ What: /sys/bus/usb/device/.../wusb_cdid
+ Date: July 2008
+ KernelVersion: 2.6.27
+ Contact: David Vrabel <david.vrabel@xxxxxxx>
+ Description:
+ For Certified Wireless USB devices only.
+
+ A devices's CDID, as 16 space-separated hex octets.
+
+ What: /sys/bus/usb/device/.../wusb_ck
+ Date: July 2008
+ KernelVersion: 2.6.27
+ Contact: David Vrabel <david.vrabel@xxxxxxx>
+ Description:
+ For Certified Wireless USB devices only.
+
+ Write the device's connection key (CK) to start the
+ authentication of the device. The CK is 16
+ space-separated hex octets.
+
+ What: /sys/bus/usb/device/.../wusb_disconnect
+ Date: July 2008
+ KernelVersion: 2.6.27
+ Contact: David Vrabel <david.vrabel@xxxxxxx>
+ Description:
+ For Certified Wireless USB devices only.
+
+ Write a 1 to force the device to disconnect
+ (equivalent to unplugging a wired USB device).
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
