Commit 4749f32d authored by Adrian Bunk's avatar Adrian Bunk Committed by Linus Torvalds
Browse files

[PATCH] better USB_MON dependencies 



This makes the USB_MON less confusing.

Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 24665cd0

drivers/usb/core/hcd.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/usb/core/hcd.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/usb/mon/Kconfig

+4 −9
Original line number Diff line number Diff line
@@ -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.

drivers/usb/mon/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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

include/linux/usb.h

+1 −1
Original line number Diff line number Diff line
@@ -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