From: Andrzej Pietrasiewicz Date: Tue, 22 Jul 2014 17:58:37 +0000 (+0200) Subject: usb: gadget: f_uac1: prepare for separate compilation X-Git-Tag: v3.18-rc1~131^2~118^2~77 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=af1a58ca00b3735275c453ebd0b811a71a377470;p=linux.git usb: gadget: f_uac1: prepare for separate compilation Integrating configfs requires converting f_uac1 to new function interface, which in turn requires converting it to the new function interface, which involves separate compilation of f_uac1.c into usb_f_uac1.ko. u_uac1.c contains some module parameters. After this patch is applied they are still a part of the resulting g_audio.ko, but can be guarded with a compatiblity flag which will be removed when no users of the old function interface of f_uac1 are left. Tested-by: Sebastian Reimers Signed-off-by: Andrzej Pietrasiewicz Signed-off-by: Felipe Balbi --- diff --git a/drivers/usb/gadget/function/f_uac1.c b/drivers/usb/gadget/function/f_uac1.c index 1c0c4b83cb8f..9cfaf1de7b90 100644 --- a/drivers/usb/gadget/function/f_uac1.c +++ b/drivers/usb/gadget/function/f_uac1.c @@ -15,6 +15,7 @@ #include #include "u_uac1.h" +#include "u_uac1.c" #define OUT_EP_MAX_PACKET_SIZE 200 static int req_buf_size = OUT_EP_MAX_PACKET_SIZE; diff --git a/drivers/usb/gadget/legacy/audio.c b/drivers/usb/gadget/legacy/audio.c index c28691fbb576..47a7de71f7fb 100644 --- a/drivers/usb/gadget/legacy/audio.c +++ b/drivers/usb/gadget/legacy/audio.c @@ -81,7 +81,6 @@ static struct usb_function *f_uac2; #ifdef CONFIG_GADGET_UAC1 #include "u_uac1.h" -#include "u_uac1.c" #include "f_uac1.c" #endif