diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-11-22 13:06:44 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-11-22 13:06:44 -0500 |
| commit | 0bd2af46839ad6262d25714a6ec0365db9d6b98f (patch) | |
| tree | dcced72d230d69fd0c5816ac6dd03ab84799a93e /drivers/usb/Makefile | |
| parent | e138a5d2356729b8752e88520cc1525fae9794ac (diff) | |
| parent | f26b90440cd74c78fe10c9bd5160809704a9627c (diff) | |
Merge ../scsi-rc-fixes-2.6
Diffstat (limited to 'drivers/usb/Makefile')
| -rw-r--r-- | drivers/usb/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile index 97d57cfc343b..825bf884537a 100644 --- a/drivers/usb/Makefile +++ b/drivers/usb/Makefile | |||
| @@ -33,7 +33,6 @@ obj-$(CONFIG_USB_KBTAB) += input/ | |||
| 33 | obj-$(CONFIG_USB_MOUSE) += input/ | 33 | obj-$(CONFIG_USB_MOUSE) += input/ |
| 34 | obj-$(CONFIG_USB_MTOUCH) += input/ | 34 | obj-$(CONFIG_USB_MTOUCH) += input/ |
| 35 | obj-$(CONFIG_USB_POWERMATE) += input/ | 35 | obj-$(CONFIG_USB_POWERMATE) += input/ |
| 36 | obj-$(CONFIG_USB_TRANCEVIBRATOR)+= input/ | ||
| 37 | obj-$(CONFIG_USB_WACOM) += input/ | 36 | obj-$(CONFIG_USB_WACOM) += input/ |
| 38 | obj-$(CONFIG_USB_XPAD) += input/ | 37 | obj-$(CONFIG_USB_XPAD) += input/ |
| 39 | 38 | ||
| @@ -66,6 +65,7 @@ obj-$(CONFIG_USB_PHIDGETSERVO) += misc/ | |||
| 66 | obj-$(CONFIG_USB_RIO500) += misc/ | 65 | obj-$(CONFIG_USB_RIO500) += misc/ |
| 67 | obj-$(CONFIG_USB_SISUSBVGA) += misc/ | 66 | obj-$(CONFIG_USB_SISUSBVGA) += misc/ |
| 68 | obj-$(CONFIG_USB_TEST) += misc/ | 67 | obj-$(CONFIG_USB_TEST) += misc/ |
| 68 | obj-$(CONFIG_USB_TRANCEVIBRATOR)+= misc/ | ||
| 69 | obj-$(CONFIG_USB_USS720) += misc/ | 69 | obj-$(CONFIG_USB_USS720) += misc/ |
| 70 | 70 | ||
| 71 | obj-$(CONFIG_USB_ATM) += atm/ | 71 | obj-$(CONFIG_USB_ATM) += atm/ |