diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-04-02 00:08:05 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-04-02 00:08:05 -0500 |
| commit | 95d465fd750897ab32462a6702fbfe1b122cbbc0 (patch) | |
| tree | 65c38b2f11c51bb6932e44dd6c92f15b0091abfe /drivers/usb/gadget/Makefile | |
| parent | 642fde17dceceb56c7ba2762733ac688666ae657 (diff) | |
| parent | 683aa4012f53b2ada0f430487e05d37b0d94e90a (diff) | |
Manual merge with Linus.
Conflicts:
arch/powerpc/kernel/setup-common.c
drivers/input/keyboard/hil_kbd.c
drivers/input/mouse/hil_ptr.c
Diffstat (limited to 'drivers/usb/gadget/Makefile')
| -rw-r--r-- | drivers/usb/gadget/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile index d5fd04d886e6..5a28e61392ec 100644 --- a/drivers/usb/gadget/Makefile +++ b/drivers/usb/gadget/Makefile | |||
| @@ -7,6 +7,7 @@ obj-$(CONFIG_USB_PXA2XX) += pxa2xx_udc.o | |||
| 7 | obj-$(CONFIG_USB_GOKU) += goku_udc.o | 7 | obj-$(CONFIG_USB_GOKU) += goku_udc.o |
| 8 | obj-$(CONFIG_USB_OMAP) += omap_udc.o | 8 | obj-$(CONFIG_USB_OMAP) += omap_udc.o |
| 9 | obj-$(CONFIG_USB_LH7A40X) += lh7a40x_udc.o | 9 | obj-$(CONFIG_USB_LH7A40X) += lh7a40x_udc.o |
| 10 | obj-$(CONFIG_USB_AT91) += at91_udc.o | ||
| 10 | 11 | ||
| 11 | # | 12 | # |
| 12 | # USB gadget drivers | 13 | # USB gadget drivers |