Merge branch 'fixes_stg' of ../git_old into fixes (db0a2901) · Commits · e / devices / android_kernel_teracube_2e

Documentation/video4linux/CARDLIST.au0828

+1 −0

Original line number	Diff line number	Diff line
		@@ -3,3 +3,4 @@
		2 -> Hauppauge HVR850 (au0828) [2040:7240]
		3 -> DViCO FusionHDTV USB (au0828) [0fe9:d620]
		4 -> Hauppauge HVR950Q rev xxF8 (au0828) [2040:7201,2040:7211,2040:7281]
		5 -> Hauppauge Woodbury (au0828) [2040:8200]

Documentation/video4linux/gspca.txt

+16 −13

Original line number	Diff line number	Diff line
		@@ -88,8 +88,8 @@ zc3xx 0471:0325 Philips SPC 200 NC
		zc3xx 0471:0326 Philips SPC 300 NC
		sonixj 0471:0327 Philips SPC 600 NC
		sonixj 0471:0328 Philips SPC 700 NC
		zc3xx 0471:032d Philips spc210nc
		zc3xx 0471:032e Philips spc315nc
		zc3xx 0471:032d Philips SPC 210 NC
		zc3xx 0471:032e Philips SPC 315 NC
		sonixj 0471:0330 Philips SPC 710 NC
		spca501 0497:c001 Smile International
		sunplus 04a5:3003 Benq DC 1300
		@@ -175,19 +175,21 @@ sunplus 08ca:2060 Aiptek PocketDV5300
		tv8532 0923:010f ICM532 cams
		mars 093a:050f Mars-Semi Pc-Camera
		pac207 093a:2460 PAC207 Qtec Webcam 100
		pac207 093a:2463 Philips spc200nc pac207
		pac207 093a:2463 Philips SPC 220 NC
		pac207 093a:2464 Labtec Webcam 1200
		pac207 093a:2468 PAC207
		pac207 093a:2470 Genius GF112
		pac207 093a:2471 PAC207 Genius VideoCam ge111
		pac207 093a:2472 PAC207 Genius VideoCam ge110
		pac207 093a:2471 Genius VideoCam ge111
		pac207 093a:2472 Genius VideoCam ge110
		pac7311 093a:2600 PAC7311 Typhoon
		pac7311 093a:2601 PAC7311 Phillips SPC610NC
		pac7311 093a:2601 Philips SPC 610 NC
		pac7311 093a:2603 PAC7312
		pac7311 093a:2608 PAC7311 Trust WB-3300p
		pac7311 093a:260e PAC7311 Gigaware VGA PC Camera, Trust WB-3350p, SIGMA cam 2350
		pac7311 093a:260f PAC7311 SnakeCam
		pac7311 093a:2608 Trust WB-3300p
		pac7311 093a:260e Gigaware VGA PC Camera, Trust WB-3350p, SIGMA cam 2350
		pac7311 093a:260f SnakeCam
		pac7311 093a:2621 PAC731x
		pac7311 093a:2624 PAC7302
		pac7311 093a:2626 Labtec 2200
		zc3xx 0ac8:0302 Z-star Vimicro zc0302
		vc032x 0ac8:0321 Vimicro generic vc0321
		vc032x 0ac8:0323 Vimicro Vc0323
		@@ -220,6 +222,7 @@ sonixj 0c45:60c0 Sangha Sn535
		sonixj 0c45:60ec SN9C105+MO4000
		sonixj 0c45:60fb Surfer NoName
		sonixj 0c45:60fc LG-LIC300
		sonixj 0c45:6128 Microdia/Sonix SNP325
		sonixj 0c45:612a Avant Camera
		sonixj 0c45:612c Typhoon Rasy Cam 1.3MPix
		sonixj 0c45:6130 Sonix Pccam
		@@ -234,7 +237,7 @@ zc3xx 10fd:0128 Typhoon Webshot II USB 300k 0x0128
		spca561 10fd:7e50 FlyCam Usb 100
		zc3xx 10fd:8050 Typhoon Webshot II USB 300k
		spca501 1776:501c Arowana 300K CMOS Camera
		t613 17a1:0128 T613/TAS5130A
		t613 17a1:0128 TASCORP JPEG Webcam, NGS Cyclops
		vc032x 17ef:4802 Lenovo Vc0323+MI1310_SOC
		pac207 2001:f115 D-Link DSB-C120
		spca500 2899:012c Toptro Industrial

drivers/media/common/saa7146_video.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -1068,7 +1068,7 @@ int saa7146_video_do_ioctl(struct inode inode, struct file file, unsigned int
		{
		v4l2_std_id *id = arg;
		int found = 0;
		int i, err;
		int i;

		DEB_EE(("VIDIOC_S_STD\n"));

		@@ -1116,7 +1116,6 @@ int saa7146_video_do_ioctl(struct inode inode, struct file file, unsigned int
		case VIDIOC_OVERLAY:
		{
		int on = (int )arg;
		int err = 0;

		DEB_D(("VIDIOC_OVERLAY on:%d\n",on));
		if (on != 0) {
		@@ -1192,7 +1191,6 @@ int saa7146_video_do_ioctl(struct inode inode, struct file file, unsigned int
		case VIDIOCGMBUF:
		{
		struct video_mbuf *mbuf = arg;
		struct videobuf_queue *q;
		int i;

		/* fixme: number of capture buffers and sizes for v4l apps */

drivers/media/common/tuners/mt2131.c

+1 −1

Original line number	Diff line number	Diff line
		/*
		* Driver for Microtune MT2131 "QAM/8VSB single chip tuner"
		*
		* Copyright (c) 2006 Steven Toth <stoth@hauppauge.com>
		* Copyright (c) 2006 Steven Toth <stoth@linuxtv.org>
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License as published by

drivers/media/common/tuners/mt2131.h

+1 −1

Original line number	Diff line number	Diff line
		/*
		* Driver for Microtune MT2131 "QAM/8VSB single chip tuner"
		*
		* Copyright (c) 2006 Steven Toth <stoth@hauppauge.com>
		* Copyright (c) 2006 Steven Toth <stoth@linuxtv.org>
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License as published by