summaryrefslogtreecommitdiffstats
path: root/drivers/usb/core
diff options
context:
space:
mode:
authorAdrian Bunk2005-06-23 11:36:56 +0200
committerLinus Torvalds2005-06-23 19:04:15 +0200
commit4749f32da939d4e4160541b2cadc22492bb507ec (patch)
treea04b8d1d711f5f7c7dcc4dd43f6bfe17c54c306f /drivers/usb/core
parentMerge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/paulus/ppc64-2.6 (diff)
downloadkernel-qcow2-linux-4749f32da939d4e4160541b2cadc22492bb507ec.tar.gz
kernel-qcow2-linux-4749f32da939d4e4160541b2cadc22492bb507ec.tar.xz
kernel-qcow2-linux-4749f32da939d4e4160541b2cadc22492bb507ec.zip
[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>
Diffstat (limited to 'drivers/usb/core')
-rw-r--r--drivers/usb/core/hcd.c2
-rw-r--r--drivers/usb/core/hcd.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
index d041782e0c8b..0da23732e807 100644
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@ -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;
diff --git a/drivers/usb/core/hcd.h b/drivers/usb/core/hcd.h
index f67cf1e634fc..325a51656c3f 100644
--- a/drivers/usb/core/hcd.h
+++ b/drivers/usb/core/hcd.h
@@ -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);