aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/usb.h
diff options
context:
space:
mode:
authorPete Zaitcev <zaitcev@redhat.com>2008-11-13 23:31:21 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2009-01-07 12:59:54 -0500
commitf150fa1afbf69a87f54752579ff2bb769aad88b3 (patch)
tree00bab764efef6249694a804a76a4cdd9720811d1 /include/linux/usb.h
parent5e5b0e5d6a354f6f457368149eb2e9a61e5576cf (diff)
USB: Allow usbmon as a module even if usbcore is builtin
usbmon can only be built as a module if usbcore is a module too. Trivial changes to the relevant Kconfig and Makefile (and a few trivial changes elsewhere) allow usbmon to be built as a module even if usbcore is builtin. This is verified to work in all 9 permutations (3 correctly prohibited by Kconfig, 6 build a suitable result). Signed-off-by: Paul Bolle <pebolle@tiscali.nl> Signed-off-by: Pete Zaitcev <zaitcev@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include/linux/usb.h')
-rw-r--r--include/linux/usb.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/usb.h b/include/linux/usb.h
index c8e55aa979de..8bc81bffc195 100644
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -336,7 +336,7 @@ struct usb_bus {
336#endif 336#endif
337 struct device *dev; /* device for this bus */ 337 struct device *dev; /* device for this bus */
338 338
339#if defined(CONFIG_USB_MON) 339#if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
340 struct mon_bus *mon_bus; /* non-null when associated */ 340 struct mon_bus *mon_bus; /* non-null when associated */
341 int monitored; /* non-zero when monitored */ 341 int monitored; /* non-zero when monitored */
342#endif 342#endif