diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-27 14:47:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-27 14:47:31 -0700 |
| commit | 3e0777b8fa96f7073ed5d13d3bc1d573b766bef9 (patch) | |
| tree | 3849e8457dd8f038ab7da025c708e275b43ea9c1 /drivers/usb/Makefile | |
| parent | a94130e00038ebeb2f66901a4a4a9e05a03051c1 (diff) | |
| parent | e5119885f00874453e837e3407014b73de2f4741 (diff) | |
| download | blackbird-op-linux-3e0777b8fa96f7073ed5d13d3bc1d573b766bef9.tar.gz blackbird-op-linux-3e0777b8fa96f7073ed5d13d3bc1d573b766bef9.zip | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/dtor/input.git manually
Some manual fixups required due to clashes with the PF_FREEZE cleanups.
Diffstat (limited to 'drivers/usb/Makefile')
| -rw-r--r-- | drivers/usb/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile index a61d4433a989..a708a1dbb530 100644 --- a/drivers/usb/Makefile +++ b/drivers/usb/Makefile @@ -31,6 +31,7 @@ obj-$(CONFIG_USB_MOUSE) += input/ obj-$(CONFIG_USB_MTOUCH) += input/ obj-$(CONFIG_USB_POWERMATE) += input/ obj-$(CONFIG_USB_WACOM) += input/ +obj-$(CONFIG_USB_ACECAD) += input/ obj-$(CONFIG_USB_XPAD) += input/ obj-$(CONFIG_USB_DABUSB) += media/ |
