diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-05-18 04:15:09 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-05-18 04:15:35 -0400 |
| commit | 1079cac0f4eb7d968395378b1625979d4c818dd6 (patch) | |
| tree | d261058d95d27fe7250511d5fad69db30dc17731 /drivers/usb/Makefile | |
| parent | 5872144f64b34a5942f6b4acedc90b02de72c58b (diff) | |
| parent | 1406de8e11eb043681297adf86d6892ff8efc27a (diff) | |
Merge commit 'v2.6.30-rc6' into tracing/core
Merge reason: we were on an -rc4 base, sync up to -rc6
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/usb/Makefile')
| -rw-r--r-- | drivers/usb/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile index 89299a5ce168..0716cdb44cd8 100644 --- a/drivers/usb/Makefile +++ b/drivers/usb/Makefile | |||
| @@ -27,6 +27,8 @@ obj-$(CONFIG_USB_WUSB) += wusbcore/ | |||
| 27 | 27 | ||
| 28 | obj-$(CONFIG_USB_ACM) += class/ | 28 | obj-$(CONFIG_USB_ACM) += class/ |
| 29 | obj-$(CONFIG_USB_PRINTER) += class/ | 29 | obj-$(CONFIG_USB_PRINTER) += class/ |
| 30 | obj-$(CONFIG_USB_WDM) += class/ | ||
| 31 | obj-$(CONFIG_USB_TMC) += class/ | ||
| 30 | 32 | ||
| 31 | obj-$(CONFIG_USB_STORAGE) += storage/ | 33 | obj-$(CONFIG_USB_STORAGE) += storage/ |
| 32 | obj-$(CONFIG_USB) += storage/ | 34 | obj-$(CONFIG_USB) += storage/ |