Commit e1d5d71d authored by Michael Grzeschik's avatar Michael Grzeschik Committed by Greg Kroah-Hartman
Browse files

usb: uvc: move media/v4l2-uvc.h to usb/uvc.h 



Since the headerfile is only used in usb devices it is better
placed with the other usb files.

Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: default avatarDaniel Scally <dan.scally@ideasonboard.com>
Tested-by: default avatarDaniel Scally <dan.scally@ideasonboard.com>
Signed-off-by: default avatarMichael Grzeschik <m.grzeschik@pengutronix.de>
Link: https://lore.kernel.org/r/20230126231456.3402323-3-m.grzeschik@pengutronix.de


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 015d44c2

drivers/media/usb/uvc/uvc_ctrl.c

+1 −1
Original line number Diff line number Diff line
@@ -14,13 +14,13 @@ 
#include <linux/slab.h>

#include <linux/uaccess.h>

#include <linux/usb.h>

#include <linux/usb/uvc.h>

#include <linux/videodev2.h>

#include <linux/vmalloc.h>

#include <linux/wait.h>

#include <linux/workqueue.h>

#include <linux/atomic.h>

#include <media/v4l2-ctrls.h>

#include <media/v4l2-uvc.h>



#include "uvcvideo.h"

drivers/media/usb/uvc/uvc_driver.c

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

#include <linux/slab.h>

#include <linux/usb.h>

#include <linux/usb/uvc.h>

#include <linux/videodev2.h>

#include <linux/vmalloc.h>

#include <linux/wait.h>
@@ -21,7 +22,6 @@ 


#include <media/v4l2-common.h>

#include <media/v4l2-ioctl.h>

#include <media/v4l2-uvc.h>



#include "uvcvideo.h"

drivers/usb/gadget/function/uvc_v4l2.c

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

#include <linux/list.h>

#include <linux/usb/g_uvc.h>

#include <linux/usb/uvc.h>

#include <linux/videodev2.h>

#include <linux/vmalloc.h>

#include <linux/wait.h>
@@ -18,7 +19,6 @@ 
#include <media/v4l2-dev.h>

#include <media/v4l2-event.h>

#include <media/v4l2-ioctl.h>

#include <media/v4l2-uvc.h>



#include "f_uvc.h"

#include "uvc.h"

include/media/v4l2-uvc.h→include/linux/usb/uvc.h

+0 −0

File moved.

View file