Gitweb: http://git.kernel.org/linus/5d9955f8a978c1992a0f9966d22c43471214d43b
Commit: 5d9955f8a978c1992a0f9966d22c43471214d43b
Parent: b6ae906b04113cb73c1ffe9c42fbcdcb074d9f07
Author: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
AuthorDate: Sat Jul 10 16:13:05 2010 -0300
Committer: Mauro Carvalho Chehab <mchehab@redhat.com>
CommitDate: Sun Jul 11 17:45:10 2010 -0300
V4L/DVB: uvc: Fix multiple symbols definitions with UVC gadget and host drivers
The UVC gadget driver borrowed code from the UVC host driver without
changing the symbol names. This results in a namespace clash with
multiple definitions of several symbols when compiling both drivers in
the kernel.
Make all generic UVC functions and variables static in the UVC gadget
driver, as the symbols are not referenced outside of the gadget driver.
Rename the uvc_trace_param global variable to uvc_gadget_trace_param.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---
drivers/usb/gadget/f_uvc.c | 4 +-
drivers/usb/gadget/uvc.h | 10 +--
drivers/usb/gadget/uvc_queue.c | 153 +++++++++++++++++++++-------------------
drivers/usb/gadget/uvc_queue.h | 20 -----
drivers/usb/gadget/uvc_v4l2.c | 2 +-
drivers/usb/gadget/uvc_video.c | 6 +-
drivers/usb/gadget/webcam.c | 4 +-
7 files changed, 89 insertions(+), 110 deletions(-)
diff --git a/drivers/usb/gadget/f_uvc.c b/drivers/usb/gadget/f_uvc.c
index fc2611f..dbe6db0 100644
--- a/drivers/usb/gadget/f_uvc.c
+++ b/drivers/usb/gadget/f_uvc.c
@@ -28,7 +28,7 @@
#include "uvc.h"
-unsigned int uvc_trace_param;
+unsigned int uvc_gadget_trace_param;
/* --------------------------------------------------------------------------
* Function descriptors
@@ -656,6 +656,6 @@ error:
return ret;
}
-module_param_named(trace, uvc_trace_param, uint, ...
