lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

USB: Allow usbmon as a module even if usbcore is builtin

Browse Source 
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>
This commit is contained in:
Pete Zaitcev
2008-11-13 21:31:21 -07:00
committed by Greg Kroah-Hartman
parent 5e5b0e5d6a
commit f150fa1afb
5 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/usb.h
View File

@ -336,7 +336,7 @@ struct usb_bus {
#endif
struct device *dev; /* device for this bus */
#if defined(CONFIG_USB_MON)
#if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
struct mon_bus *mon_bus; /* non-null when associated */
int monitored; /* non-zero when monitored */
#endif