summaryrefslogtreecommitdiffstats
path: root/drivers/usb/misc/Makefile
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-03-28 22:27:45 +0100
committerIngo Molnar <mingo@elte.hu>2009-03-28 22:27:45 +0100
commit3fab191002b184e4390aa07c7149c6cc7b638ec7 (patch)
tree821382d49e47c19531bfc3bb9e1f8922486374d4 /drivers/usb/misc/Makefile
parent93394a761d78503f11d05b1a7b23d5a9ccc8dad2 (diff)
parent7c730ccdc1188b97f5c8cb690906242c7ed75c22 (diff)
downloadblackbird-op-linux-3fab191002b184e4390aa07c7149c6cc7b638ec7.tar.gz
blackbird-op-linux-3fab191002b184e4390aa07c7149c6cc7b638ec7.zip
Merge branch 'linus' into x86/core
Diffstat (limited to 'drivers/usb/misc/Makefile')
-rw-r--r--drivers/usb/misc/Makefile4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/usb/misc/Makefile b/drivers/usb/misc/Makefile
index 1334f7bdd7be..0826aab8303f 100644
--- a/drivers/usb/misc/Makefile
+++ b/drivers/usb/misc/Makefile
@@ -18,10 +18,6 @@ obj-$(CONFIG_USB_LCD) += usblcd.o
obj-$(CONFIG_USB_LD) += ldusb.o
obj-$(CONFIG_USB_LED) += usbled.o
obj-$(CONFIG_USB_LEGOTOWER) += legousbtower.o
-obj-$(CONFIG_USB_PHIDGET) += phidget.o
-obj-$(CONFIG_USB_PHIDGETKIT) += phidgetkit.o
-obj-$(CONFIG_USB_PHIDGETMOTORCONTROL) += phidgetmotorcontrol.o
-obj-$(CONFIG_USB_PHIDGETSERVO) += phidgetservo.o
obj-$(CONFIG_USB_RIO500) += rio500.o
obj-$(CONFIG_USB_TEST) += usbtest.o
obj-$(CONFIG_USB_TRANCEVIBRATOR) += trancevibrator.o
OpenPOWER on IntegriCloud