On Tue, Jun 21, 2005 at 11:04:10PM +0200, Adrian Bunk wrote:
> 
> I thought it was required, but reading Documentation/kbuild/makefiles.txt
> convinces me you are correct.

I forgot to attach the updated patch...
Here it is.

cu
Adrian


<--  snip  -->



This patch makes the USB_MON less confusing.

Signed-off-by: Adrian Bunk <[EMAIL PROTECTED]>

---

 drivers/usb/core/hcd.c   |    2 +-
 drivers/usb/core/hcd.h   |    2 +-
 drivers/usb/mon/Kconfig  |   13 ++++---------
 drivers/usb/mon/Makefile |    2 +-
 include/linux/usb.h      |    2 +-
 5 files changed, 8 insertions(+), 13 deletions(-)

--- linux-2.6.12-mm1-full/drivers/usb/mon/Kconfig.old   2005-06-21 
16:01:03.000000000 +0200
+++ linux-2.6.12-mm1-full/drivers/usb/mon/Kconfig       2005-06-21 
16:02:13.000000000 +0200
@@ -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 @@
          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.
--- linux-2.6.12-mm1-full/drivers/usb/mon/Makefile.old  2005-06-21 
16:02:29.000000000 +0200
+++ linux-2.6.12-mm1-full/drivers/usb/mon/Makefile      2005-06-21 
16:03:09.000000000 +0200
@@ -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
--- linux-2.6.12-mm1-full/include/linux/usb.h.old       2005-06-21 
16:04:38.000000000 +0200
+++ linux-2.6.12-mm1-full/include/linux/usb.h   2005-06-21 16:04:44.000000000 
+0200
@@ -290,7 +290,7 @@
        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
--- linux-2.6.12-mm1-full/drivers/usb/core/hcd.h.old    2005-06-21 
16:05:02.000000000 +0200
+++ linux-2.6.12-mm1-full/drivers/usb/core/hcd.h        2005-06-21 
16:05:08.000000000 +0200
@@ -410,7 +410,7 @@
 
 /*-------------------------------------------------------------------------*/
 
-#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);
--- linux-2.6.12-mm1-full/drivers/usb/core/hcd.c.old    2005-06-21 
16:05:21.000000000 +0200
+++ linux-2.6.12-mm1-full/drivers/usb/core/hcd.c        2005-06-21 
16:05:27.000000000 +0200
@@ -1855,7 +1855,7 @@
 
 /*-------------------------------------------------------------------------*/
 
-#if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
+#if defined(CONFIG_USB_MON)
 
 struct usb_mon_operations *mon_ops;
 




-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
_______________________________________________
linux-usb-devel@lists.sourceforge.net
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel

Reply via email to