diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/usb/misc/Makefile | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/usb/misc/Makefile')
| -rw-r--r-- | drivers/usb/misc/Makefile | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/usb/misc/Makefile b/drivers/usb/misc/Makefile index 0826aab8303f..717703e81425 100644 --- a/drivers/usb/misc/Makefile +++ b/drivers/usb/misc/Makefile | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | 5 | ||
| 6 | obj-$(CONFIG_USB_ADUTUX) += adutux.o | 6 | obj-$(CONFIG_USB_ADUTUX) += adutux.o |
| 7 | obj-$(CONFIG_USB_APPLEDISPLAY) += appledisplay.o | 7 | obj-$(CONFIG_USB_APPLEDISPLAY) += appledisplay.o |
| 8 | obj-$(CONFIG_USB_BERRY_CHARGE) += berry_charge.o | ||
| 9 | obj-$(CONFIG_USB_CYPRESS_CY7C63)+= cypress_cy7c63.o | 8 | obj-$(CONFIG_USB_CYPRESS_CY7C63)+= cypress_cy7c63.o |
| 10 | obj-$(CONFIG_USB_CYTHERM) += cytherm.o | 9 | obj-$(CONFIG_USB_CYTHERM) += cytherm.o |
| 11 | obj-$(CONFIG_USB_EMI26) += emi26.o | 10 | obj-$(CONFIG_USB_EMI26) += emi26.o |
| @@ -23,7 +22,6 @@ obj-$(CONFIG_USB_TEST) += usbtest.o | |||
| 23 | obj-$(CONFIG_USB_TRANCEVIBRATOR) += trancevibrator.o | 22 | obj-$(CONFIG_USB_TRANCEVIBRATOR) += trancevibrator.o |
| 24 | obj-$(CONFIG_USB_USS720) += uss720.o | 23 | obj-$(CONFIG_USB_USS720) += uss720.o |
| 25 | obj-$(CONFIG_USB_SEVSEG) += usbsevseg.o | 24 | obj-$(CONFIG_USB_SEVSEG) += usbsevseg.o |
| 26 | obj-$(CONFIG_USB_VST) += vstusb.o | ||
| 27 | 25 | ||
| 28 | obj-$(CONFIG_USB_SISUSBVGA) += sisusbvga/ | 26 | obj-$(CONFIG_USB_SISUSBVGA) += sisusbvga/ |
| 29 | 27 | ||