usb gadget: link fixes for storage gadget

Change how the file storage 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 ...".

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 1 insertions, 2 deletions

diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile
index 99956b79bdf5..736d58fe941e 100644
--- a/drivers/usb/gadget/Makefile
+++ b/drivers/usb/gadget/Makefile
@@ -29,8 +29,7 @@ g_ether-objs			:= ether.o u_ether.o f_subset.o f_ecm.o $(C_UTILS)
 g_serial-objs                   := serial.o
 g_midi-objs                     := gmidi.o
 gadgetfs-objs                   := inode.o
-g_file_storage-objs             := file_storage.o usbstring.o config.o \
-                                        epautoconf.o
+g_file_storage-objs             := file_storage.o
 g_printer-objs                  := printer.o
 g_cdc-objs                      := cdc2.o u_ether.o f_ecm.o \
                                         u_serial.o f_acm.o $(C_UTILS)