]> bbs.cooldavid.org Git - net-next-2.6.git/commit
V4L/DVB: uvc: Fix multiple symbols definitions with UVC gadget and host drivers
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Sat, 10 Jul 2010 19:13:05 +0000 (16:13 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Sun, 11 Jul 2010 20:45:10 +0000 (17:45 -0300)
commit5d9955f8a978c1992a0f9966d22c43471214d43b
treea207631118ed9ae8f7757adabda576ee5923ae97
parentb6ae906b04113cb73c1ffe9c42fbcdcb074d9f07
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
drivers/usb/gadget/uvc.h
drivers/usb/gadget/uvc_queue.c
drivers/usb/gadget/uvc_queue.h
drivers/usb/gadget/uvc_v4l2.c
drivers/usb/gadget/uvc_video.c
drivers/usb/gadget/webcam.c