diff options
author | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2012-09-06 14:11:27 -0400 |
---|---|---|
committer | Felipe Balbi <balbi@ti.com> | 2012-09-10 09:13:03 -0400 |
commit | 721e2e91945bc2520d57d795dfe1b502ecec567c (patch) | |
tree | 367b0e0de9fabd165fdae6887902c3ae72a81bef /drivers/usb/gadget/printer.c | |
parent | cc2683c318a5bf192b75cd5c343b51009db0cf6c (diff) |
usb: gadget: libcomposite: move composite.c into libcomposite
This moves composite.c into libcomposite and updates all gadgets.
Finally!
Acked-by: Michal Nazarewicz <mina86@mina86.com>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/gadget/printer.c')
-rw-r--r-- | drivers/usb/gadget/printer.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/usb/gadget/printer.c b/drivers/usb/gadget/printer.c index 9bd994203d3d..e394050afd02 100644 --- a/drivers/usb/gadget/printer.c +++ b/drivers/usb/gadget/printer.c | |||
@@ -37,22 +37,12 @@ | |||
37 | #include <asm/unaligned.h> | 37 | #include <asm/unaligned.h> |
38 | 38 | ||
39 | #include <linux/usb/ch9.h> | 39 | #include <linux/usb/ch9.h> |
40 | #include <linux/usb/composite.h> | ||
40 | #include <linux/usb/gadget.h> | 41 | #include <linux/usb/gadget.h> |
41 | #include <linux/usb/g_printer.h> | 42 | #include <linux/usb/g_printer.h> |
42 | 43 | ||
43 | #include "gadget_chips.h" | 44 | #include "gadget_chips.h" |
44 | 45 | ||
45 | |||
46 | /* | ||
47 | * Kbuild is not very cooperative with respect to linking separately | ||
48 | * compiled library objects into one module. So for now we won't use | ||
49 | * separate compilation ... ensuring init/exit sections work to shrink | ||
50 | * the runtime footprint, and giving us at least some parts of what | ||
51 | * a "gcc --combine ... part1.c part2.c part3.c ... " build would. | ||
52 | */ | ||
53 | #include "composite.c" | ||
54 | |||
55 | /*-------------------------------------------------------------------------*/ | ||
56 | USB_GADGET_COMPOSITE_OPTIONS(); | 46 | USB_GADGET_COMPOSITE_OPTIONS(); |
57 | 47 | ||
58 | #define DRIVER_DESC "Printer Gadget" | 48 | #define DRIVER_DESC "Printer Gadget" |