diff options
| author | David Brownell <dbrownell@users.sourceforge.net> | 2008-08-18 17:42:49 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-10-16 09:24:46 -0700 |
| commit | 0a56b03f68d93ddaaaf11281fed9a7940ff62216 (patch) | |
| tree | c18613da3d7580008ddc5983005ca7127d868ca2 | |
| parent | 77f754c4335d87e785cb0b85cc81e4f16d610fe5 (diff) | |
usb gadget: link fixes for printer gadget
Change how the printer 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>
| -rw-r--r-- | drivers/usb/gadget/Makefile | 3 | ||||
| -rw-r--r-- | drivers/usb/gadget/printer.c | 14 |
2 files changed, 15 insertions, 2 deletions
diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile index c47204fc673..99956b79bdf 100644 --- a/drivers/usb/gadget/Makefile +++ b/drivers/usb/gadget/Makefile @@ -31,8 +31,7 @@ g_midi-objs := gmidi.o gadgetfs-objs := inode.o g_file_storage-objs := file_storage.o usbstring.o config.o \ epautoconf.o -g_printer-objs := printer.o usbstring.o config.o \ - epautoconf.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) diff --git a/drivers/usb/gadget/printer.c b/drivers/usb/gadget/printer.c index 7a8d4a18852..2b3b9e1dd2e 100644 --- a/drivers/usb/gadget/printer.c +++ b/drivers/usb/gadget/printer.c @@ -53,6 +53,20 @@ #include "gadget_chips.h" + +/* + * Kbuild is not very cooperative with respect to linking separately + * compiled library objects into one module. So for now we won't use + * separate compilation ... ensuring init/exit sections work to shrink + * the runtime footprint, and giving us at least some parts of what + * a "gcc --combine ... part1.c part2.c part3.c ... " build would. + */ +#include "usbstring.c" +#include "config.c" +#include "epautoconf.c" + +/*-------------------------------------------------------------------------*/ + #define DRIVER_DESC "Printer Gadget" #define DRIVER_VERSION "2007 OCT 06" |