Bläddra i källkod

[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>
Pete Zaitcev 20 år sedan
förälder
incheckning
003ba51535
3 ändrade filer med 6 tillägg och 6 borttagningar
  1. 1 1
      Documentation/usb/usbmon.txt
  2. 4 5
      drivers/usb/mon/Kconfig
  3. 1 0
      drivers/usb/mon/Makefile

+ 1 - 1
Documentation/usb/usbmon.txt

@@ -102,7 +102,7 @@ Here is the list of words, from left to right:
 - URB Status. This field makes no sense for submissions, but is present
 - URB Status. This field makes no sense for submissions, but is present
   to help scripts with parsing. In error case, it contains the error code.
   to help scripts with parsing. In error case, it contains the error code.
   In case of a setup packet, it contains a Setup Tag. If scripts read a number
   In case of a setup packet, it contains a Setup Tag. If scripts read a number
-  in this field, the proceed to read Data Length. Otherwise, they read
+  in this field, they proceed to read Data Length. Otherwise, they read
   the setup packet before reading the Data Length.
   the setup packet before reading the Data Length.
 - Setup packet, if present, consists of 5 words: one of each for bmRequestType,
 - Setup packet, if present, consists of 5 words: one of each for bmRequestType,
   bRequest, wValue, wIndex, wLength, as specified by the USB Specification 2.0.
   bRequest, wValue, wIndex, wLength, as specified by the USB Specification 2.0.

+ 4 - 5
drivers/usb/mon/Kconfig

@@ -9,9 +9,8 @@ config USB_MON
 	help
 	help
 	  If you say Y here, a component which captures the USB traffic
 	  If you say Y here, a component which captures the USB traffic
 	  between peripheral-specific drivers and HC drivers will be built.
 	  between peripheral-specific drivers and HC drivers will be built.
-	  The USB_MON is similar in spirit and may be compatible with Dave
-	  Harding's USBMon.
+	  For more information, see <file:Documentation/usb/usbmon.txt>.
 
 
-	  This is somewhat experimental at this time, but it should be safe,
-	  as long as you aren't using modular USB and try to remove this
-	  module.
+	  This is somewhat experimental at this time, but it should be safe.
+
+	  If unsure, say Y.

+ 1 - 0
drivers/usb/mon/Makefile

@@ -4,4 +4,5 @@
 
 
 usbmon-objs	:= mon_main.o mon_stat.o mon_text.o
 usbmon-objs	:= mon_main.o mon_stat.o mon_text.o
 
 
+# This does not use CONFIG_USB_MON because we want this to use a tristate.
 obj-$(CONFIG_USB)	+= usbmon.o
 obj-$(CONFIG_USB)	+= usbmon.o