diff options
| author | David Brownell <dbrownell@users.sourceforge.net> | 2008-08-18 17:45:07 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-10-16 09:24:47 -0700 |
| commit | 33376c1c043c05077b4ac79c33804266f6c45e49 (patch) | |
| tree | 95d28177840c3eb1d650d7351319be2f4e141c5b /drivers/usb/gadget/Makefile | |
| parent | 8a1ce2c0447b1a0816f66fde2f832c31b5fbee2c (diff) | |
| download | blackbird-op-linux-33376c1c043c05077b4ac79c33804266f6c45e49.tar.gz blackbird-op-linux-33376c1c043c05077b4ac79c33804266f6c45e49.zip | |
usb gadget: link fixes for network gadget
Change how the Ethernet/RNDIS gadget driver builds: don't
use separate compilation, since it works poorly when key
parts are library code (with init sections etc). Instead
be as close as we can to "gcc --combine ...".
This is a bit more complicated than most of the others
because it had to resolve a few symbol collisions.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/gadget/Makefile')
| -rw-r--r-- | drivers/usb/gadget/Makefile | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile index bfa02296a16e..2267fa0b51b2 100644 --- a/drivers/usb/gadget/Makefile +++ b/drivers/usb/gadget/Makefile @@ -22,10 +22,8 @@ obj-$(CONFIG_USB_M66592) += m66592-udc.o # # USB gadget drivers # -C_UTILS = composite.o usbstring.o config.o epautoconf.o - g_zero-objs := zero.o -g_ether-objs := ether.o u_ether.o f_subset.o f_ecm.o $(C_UTILS) +g_ether-objs := ether.o g_serial-objs := serial.o g_midi-objs := gmidi.o gadgetfs-objs := inode.o @@ -33,10 +31,6 @@ g_file_storage-objs := file_storage.o g_printer-objs := printer.o g_cdc-objs := cdc2.o -ifeq ($(CONFIG_USB_ETH_RNDIS),y) - g_ether-objs += f_rndis.o rndis.o -endif - obj-$(CONFIG_USB_ZERO) += g_zero.o obj-$(CONFIG_USB_ETH) += g_ether.o obj-$(CONFIG_USB_GADGETFS) += gadgetfs.o |
