From 9a7e298a65d2ed43fa7a36c9bb546e725ff35d2e Mon Sep 17 00:00:00 2001
From: David Brownell <dbrownell@users.sourceforge.net>
Date: Mon, 18 Aug 2008 17:42:49 -0700
Subject: [PATCH] --- yaml --- r: 115127 b: refs/heads/master c:
 0a56b03f68d93ddaaaf11281fed9a7940ff62216 h: refs/heads/master i:   115125:
 ac58d9ce424b66f901eaa34c149dd1e227e45945   115123:
 4020931c95e4a9ac10a2abf01e156633ad3a31a6   115119:
 ebac3ce34dc57d46538e0841df18d701c87ce1d5 v: v3

---
 [refs]                             |  2 +-
 trunk/drivers/usb/gadget/Makefile  |  3 +--
 trunk/drivers/usb/gadget/printer.c | 14 ++++++++++++++
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 3edf972eb120..6662ab94f0e2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 77f754c4335d87e785cb0b85cc81e4f16d610fe5
+refs/heads/master: 0a56b03f68d93ddaaaf11281fed9a7940ff62216
diff --git a/trunk/drivers/usb/gadget/Makefile b/trunk/drivers/usb/gadget/Makefile
index c47204fc6733..99956b79bdf5 100644
--- a/trunk/drivers/usb/gadget/Makefile
+++ b/trunk/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/trunk/drivers/usb/gadget/printer.c b/trunk/drivers/usb/gadget/printer.c
index 7a8d4a188528..2b3b9e1dd2ee 100644
--- a/trunk/drivers/usb/gadget/printer.c
+++ b/trunk/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"