Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc995fc2 authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior Committed by Felipe Balbi
Browse files

usb: gadget: libcomposite: add epautoconf.c to libcomposite 



This patch adds epautoconf.c into libcomposite and updates all gadgets.

Acked-by: default avatarMichal Nazarewicz <mina86@mina86.com>
Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent e87bb711

drivers/usb/gadget/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ ccflags-$(CONFIG_USB_GADGET_DEBUG) := -DDEBUG 


obj-$(CONFIG_USB_GADGET)	+= udc-core.o

obj-$(CONFIG_USB_LIBCOMPOSITE)	+= libcomposite.o

libcomposite-y			:= usbstring.o config.o

libcomposite-y			:= usbstring.o config.o epautoconf.o

obj-$(CONFIG_USB_DUMMY_HCD)	+= dummy_hcd.o

obj-$(CONFIG_USB_NET2272)	+= net2272.o

obj-$(CONFIG_USB_NET2280)	+= net2280.o

drivers/usb/gadget/acm_ms.c

+0 −1
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ 
 */



#include "composite.c"

#include "epautoconf.c"

#include "u_serial.c"

#include "f_acm.c"

#include "f_mass_storage.c"

drivers/usb/gadget/audio.c

+1 −1
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/kernel.h>

#include <linux/utsname.h>



#include "gadget_chips.h"

#define DRIVER_DESC		"Linux USB Audio Gadget"

#define DRIVER_VERSION		"Feb 2, 2012"
@@ -27,7 +28,6 @@ 
 * a "gcc --combine ... part1.c part2.c part3.c ... " build would.

 */

#include "composite.c"

#include "epautoconf.c"



/* string IDs are assigned dynamically */

drivers/usb/gadget/cdc2.c

+0 −1
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ 
 */



#include "composite.c"

#include "epautoconf.c"

#include "u_serial.c"

#include "f_acm.c"

#include "f_ecm.c"

drivers/usb/gadget/dbgp.c

+0 −3
Original line number Diff line number Diff line
@@ -13,9 +13,6 @@ 
#include <linux/usb/ch9.h>

#include <linux/usb/gadget.h>



/* See comments in "zero.c" */

#include "epautoconf.c"



#ifdef CONFIG_USB_G_DBGP_SERIAL

#include "u_serial.c"

#endif