summaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorAndrzej Pietrasiewicz <andrzej.p@samsung.com>2014-07-22 19:58:37 +0200
committerFelipe Balbi <balbi@ti.com>2014-08-20 14:04:50 -0500
commitaf1a58ca00b3735275c453ebd0b811a71a377470 (patch)
tree7979c4c6ae78b6778600b2adb887f774afbef027 /drivers/usb
parentf73db69f95921512b7cba586066723b500770d1a (diff)
downloadop-kernel-dev-af1a58ca00b3735275c453ebd0b811a71a377470.zip
op-kernel-dev-af1a58ca00b3735275c453ebd0b811a71a377470.tar.gz
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 <sebastian.reimers@googlemail.com> Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@samsung.com> Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/gadget/function/f_uac1.c1
-rw-r--r--drivers/usb/gadget/legacy/audio.c1
2 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/function/f_uac1.c b/drivers/usb/gadget/function/f_uac1.c
index 1c0c4b8..9cfaf1d 100644
--- a/drivers/usb/gadget/function/f_uac1.c
+++ b/drivers/usb/gadget/function/f_uac1.c
@@ -15,6 +15,7 @@
#include <linux/atomic.h>
#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 c28691f..47a7de7 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
OpenPOWER on IntegriCloud