summaryrefslogtreecommitdiffstats
path: root/drivers/usb/mon/Makefile
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-08-14 23:10:00 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-08-14 23:10:00 -0400
commit4c0e176dd5e4c44dd60f398518f75eedbe1a65f3 (patch)
tree07aea7539f78f221c6fc535a94a07befa2afdb63 /drivers/usb/mon/Makefile
parentf241be74b803dcf9d70c9978292946370654320f (diff)
parent2ba84684e8cf6f980e4e95a2300f53a505eb794e (diff)
downloadtalos-op-linux-4c0e176dd5e4c44dd60f398518f75eedbe1a65f3.tar.gz
talos-op-linux-4c0e176dd5e4c44dd60f398518f75eedbe1a65f3.zip
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/usb/mon/Makefile')
-rw-r--r--drivers/usb/mon/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/mon/Makefile b/drivers/usb/mon/Makefile
index f18d10ce91f9..b0015b8a1d1f 100644
--- a/drivers/usb/mon/Makefile
+++ b/drivers/usb/mon/Makefile
@@ -4,4 +4,5 @@
usbmon-objs := mon_main.o mon_stat.o mon_text.o
+# This does not use CONFIG_USB_MON because we want this to use a tristate.
obj-$(CONFIG_USB) += usbmon.o
OpenPOWER on IntegriCloud