git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
drivers
/
usb
/
mon
/
Makefile
diff --git
a/drivers/usb/mon/Makefile
b/drivers/usb/mon/Makefile
index
3cff8d4
..
3cf3ea3
100644
(file)
--- a/
drivers/usb/mon/Makefile
+++ b/
drivers/usb/mon/Makefile
@@
-2,6
+2,7
@@
# Makefile for USB Core files and filesystem
#
# Makefile for USB Core files and filesystem
#
-usbmon-objs := mon_main.o mon_stat.o mon_text.o
+usbmon-objs := mon_main.o mon_stat.o mon_text.o
mon_dma.o
-obj-$(CONFIG_USB_MON) += usbmon.o
+# This does not use CONFIG_USB_MON because we want this to use a tristate.
+obj-$(CONFIG_USB) += usbmon.o