summaryrefslogtreecommitdiffstats
path: root/drivers/usb/mon/Makefile
diff options
context:
space:
mode:
authorPete Zaitcev <zaitcev@redhat.com>2008-11-13 21:31:21 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2009-01-07 09:59:54 -0800
commitf150fa1afbf69a87f54752579ff2bb769aad88b3 (patch)
tree00bab764efef6249694a804a76a4cdd9720811d1 /drivers/usb/mon/Makefile
parent5e5b0e5d6a354f6f457368149eb2e9a61e5576cf (diff)
downloadblackbird-obmc-linux-f150fa1afbf69a87f54752579ff2bb769aad88b3.tar.gz
blackbird-obmc-linux-f150fa1afbf69a87f54752579ff2bb769aad88b3.zip
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 'drivers/usb/mon/Makefile')
-rw-r--r--drivers/usb/mon/Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/usb/mon/Makefile b/drivers/usb/mon/Makefile
index 0f76ed5e1617..c6516b566731 100644
--- a/drivers/usb/mon/Makefile
+++ b/drivers/usb/mon/Makefile
@@ -4,5 +4,4 @@
usbmon-objs := mon_main.o mon_stat.o mon_text.o mon_bin.o mon_dma.o
-# This does not use CONFIG_USB_MON because we want this to use a tristate.
-obj-$(CONFIG_USB) += usbmon.o
+obj-$(CONFIG_USB_MON) += usbmon.o
OpenPOWER on IntegriCloud