Commit 003ba5153582427b1df2347553529299872961e5

Authored by Pete Zaitcev
Committed by Linus Torvalds
1 parent 43c3473552

[PATCH] USB: ub documentation update

The patch which went in was correct, but not quite what I had in mind.
Here is a patch to update that a little bit. Original patch is at:
 http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=4749f32da939d4e4160541b2cadc22492bb507ec

Signed-off-by: Pete Zaitcev <zaitcev@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 3 changed files with 6 additions and 6 deletions Side-by-side Diff

Documentation/usb/usbmon.txt
... ... @@ -102,7 +102,7 @@
102 102 - URB Status. This field makes no sense for submissions, but is present
103 103 to help scripts with parsing. In error case, it contains the error code.
104 104 In case of a setup packet, it contains a Setup Tag. If scripts read a number
105   - in this field, the proceed to read Data Length. Otherwise, they read
  105 + in this field, they proceed to read Data Length. Otherwise, they read
106 106 the setup packet before reading the Data Length.
107 107 - Setup packet, if present, consists of 5 words: one of each for bmRequestType,
108 108 bRequest, wValue, wIndex, wLength, as specified by the USB Specification 2.0.
drivers/usb/mon/Kconfig
... ... @@ -9,10 +9,9 @@
9 9 help
10 10 If you say Y here, a component which captures the USB traffic
11 11 between peripheral-specific drivers and HC drivers will be built.
12   - The USB_MON is similar in spirit and may be compatible with Dave
13   - Harding's USBMon.
  12 + For more information, see <file:Documentation/usb/usbmon.txt>.
14 13  
15   - This is somewhat experimental at this time, but it should be safe,
16   - as long as you aren't using modular USB and try to remove this
17   - module.
  14 + This is somewhat experimental at this time, but it should be safe.
  15 +
  16 + If unsure, say Y.
drivers/usb/mon/Makefile
... ... @@ -4,5 +4,6 @@
4 4  
5 5 usbmon-objs := mon_main.o mon_stat.o mon_text.o
6 6  
  7 +# This does not use CONFIG_USB_MON because we want this to use a tristate.
7 8 obj-$(CONFIG_USB) += usbmon.o