mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

[PATCH] better USB_MON dependencies 

This makes the USB_MON less confusing.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Adrian Bunk 2005-06-23 11:36:56 +02:00 committed by Linus Torvalds
parent 24665cd00d
commit 4749f32da9
5 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/usb/core/hcd.c
View File

@ -1794,7 +1794,7 @@ EXPORT_SYMBOL (usb_remove_hcd);
/*-------------------------------------------------------------------------*/
#if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
#if defined(CONFIG_USB_MON)
struct usb_mon_operations *mon_ops;

2
drivers/usb/core/hcd.h
View File

@ -399,7 +399,7 @@ static inline void usbfs_cleanup(void) { }
/*-------------------------------------------------------------------------*/
#if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
#if defined(CONFIG_USB_MON)
struct usb_mon_operations {
void (*urb_submit)(struct usb_bus *bus, struct urb *urb);

13
drivers/usb/mon/Kconfig
View File

@ -2,13 +2,9 @@
# USB Monitor configuration
#
# In normal life, it makes little sense to have usbmon as a module, and in fact
# it is harmful, because there is no way to autoload the module.
# The 'm' option is allowed for hackers who debug the usbmon itself,
# and for those who have usbcore as a module.
config USB_MON
tristate "USB Monitor"
depends on USB
bool "USB Monitor"
depends on USB!=n
default y
help
If you say Y here, a component which captures the USB traffic
@ -17,6 +13,5 @@ config USB_MON
Harding's USBMon.
This is somewhat experimental at this time, but it should be safe,
as long as you aren't building this as a module and then removing it.
If unsure, say Y. Do not say M.
as long as you aren't using modular USB and try to remove this
module.

2
drivers/usb/mon/Makefile
View File

@ -4,4 +4,4 @@
usbmon-objs := mon_main.o mon_stat.o mon_text.o
obj-$(CONFIG_USB_MON) += usbmon.o
obj-$(CONFIG_USB) += usbmon.o

2
include/linux/usb.h
View File

@ -290,7 +290,7 @@ struct usb_bus {
struct class_device *class_dev; /* class device for this bus */
struct kref kref; /* handles reference counting this bus */
void (*release)(struct usb_bus *bus); /* function to destroy this bus's memory */
#if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
#if defined(CONFIG_USB_MON)
struct mon_bus *mon_bus; /* non-null when associated */
int monitored; /* non-zero when monitored */
#endif