diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-12-03 23:59:07 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-12-03 23:59:07 -0500 |
| commit | 79acbb3ff2d8095b692e1502b9eb2ccec348de26 (patch) | |
| tree | 6ab773e5a8f9de2cd6443362b21d0d6fffe3b35e /drivers/usb/Makefile | |
| parent | 19a79859e168640f8e16d7b216d211c1c52b687a (diff) | |
| parent | 2b5f6dcce5bf94b9b119e9ed8d537098ec61c3d2 (diff) | |
Merge branch 'linux-2.6' into for-linus
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/ |