diff --git a/[refs] b/[refs] index 5c063eff7756..1e1854b45a5d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8d6214724bb9623b25d7b24603c59691ce7f2b22 +refs/heads/master: 3851c34a835f47b78c6ef7a3fa7dd6d9af9393f9 diff --git a/trunk/drivers/media/usb/uvc/uvc_driver.c b/trunk/drivers/media/usb/uvc/uvc_driver.c index 45d7aa162d9d..287f73182a69 100644 --- a/trunk/drivers/media/usb/uvc/uvc_driver.c +++ b/trunk/drivers/media/usb/uvc/uvc_driver.c @@ -11,18 +11,6 @@ * */ -/* - * This driver aims to support video input and ouput devices compliant with the - * 'USB Video Class' specification. - * - * The driver doesn't support the deprecated v4l1 interface. It implements the - * mmap capture method only, and doesn't do any image format conversion in - * software. If your user-space application doesn't support YUYV or MJPEG, fix - * it :-). Please note that the MJPEG data have been stripped from their - * Huffman tables (DHT marker), you will need to add it back if your JPEG - * codec can't handle MJPEG data. - */ - #include #include #include