Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 (630ca048) · Commits · e / devices / android_kernel_xiaomi_sm6125

Documentation/feature-removal-schedule.txt

+49 −0

Original line number	Original line	Diff line number	Diff line
	@@ -493,3 +493,52 @@ Why: These two features use non-standard interfaces. There are the
	Who: Corentin Chary <corentin.chary@gmail.com>		Who: Corentin Chary <corentin.chary@gmail.com>

	----------------------------		----------------------------

			What: usbvideo quickcam_messenger driver
			When: 2.6.35
			Files: drivers/media/video/usbvideo/quickcam_messenger.[ch]
			Why: obsolete v4l1 driver replaced by gspca_stv06xx
			Who: Hans de Goede <hdegoede@redhat.com>

			----------------------------

			What: ov511 v4l1 driver
			When: 2.6.35
			Files: drivers/media/video/ov511.[ch]
			Why: obsolete v4l1 driver replaced by gspca_ov519
			Who: Hans de Goede <hdegoede@redhat.com>

			----------------------------

			What: w9968cf v4l1 driver
			When: 2.6.35
			Files: drivers/media/video/w9968cf*.[ch]
			Why: obsolete v4l1 driver replaced by gspca_ov519
			Who: Hans de Goede <hdegoede@redhat.com>

			----------------------------

			What: ovcamchip sensor framework
			When: 2.6.35
			Files: drivers/media/video/ovcamchip/*
			Why: Only used by obsoleted v4l1 drivers
			Who: Hans de Goede <hdegoede@redhat.com>

			----------------------------

			What: stv680 v4l1 driver
			When: 2.6.35
			Files: drivers/media/video/stv680.[ch]
			Why: obsolete v4l1 driver replaced by gspca_stv0680
			Who: Hans de Goede <hdegoede@redhat.com>

			----------------------------

			What: zc0301 v4l driver
			When: 2.6.35
			Files: drivers/media/video/zc0301/*
			Why: Duplicate functionality with the gspca_zc3xx driver, zc0301 only
			supports 2 USB-ID's (because it only supports a limited set of
			sensors) wich are also supported by the gspca_zc3xx driver
			(which supports 53 USB-ID's in total)
			Who: Hans de Goede <hdegoede@redhat.com>

MAINTAINERS

+3 −4

Original line number	Original line	Diff line number	Diff line
	@@ -1637,9 +1637,8 @@ S: Maintained
	F: sound/pci/cs5535audio/		F: sound/pci/cs5535audio/

	CX18 VIDEO4LINUX DRIVER		CX18 VIDEO4LINUX DRIVER
	M: Hans Verkuil <hverkuil@xs4all.nl>
	M: Andy Walls <awalls@radix.net>		M: Andy Walls <awalls@radix.net>
	L: ivtv-devel@ivtvdriver.org		L: ivtv-devel@ivtvdriver.org (moderated for non-subscribers)
	L: linux-media@vger.kernel.org		L: linux-media@vger.kernel.org
	T: git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git		T: git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
	W: http://linuxtv.org		W: http://linuxtv.org
	@@ -3011,8 +3010,8 @@ S: Maintained
	F: drivers/isdn/hardware/eicon/		F: drivers/isdn/hardware/eicon/

	IVTV VIDEO4LINUX DRIVER		IVTV VIDEO4LINUX DRIVER
	M: Hans Verkuil <hverkuil@xs4all.nl>		M: Andy Walls <awalls@radix.net>
	L: ivtv-devel@ivtvdriver.org		L: ivtv-devel@ivtvdriver.org (moderated for non-subscribers)
	L: linux-media@vger.kernel.org		L: linux-media@vger.kernel.org
	T: git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git		T: git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
	W: http://www.ivtvdriver.org		W: http://www.ivtvdriver.org

drivers/media/IR/ir-keytable.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -13,7 +13,7 @@
	*/		*/


	#include <linux/usb/input.h>		#include <linux/input.h>
	#include <media/ir-common.h>		#include <media/ir-common.h>

	#define IR_TAB_MIN_SIZE 32		#define IR_TAB_MIN_SIZE 32

drivers/media/common/tuners/tda8290.c

+8 −4

Original line number	Original line	Diff line number	Diff line
	@@ -144,7 +144,8 @@ static void set_audio(struct dvb_frontend *fe,
	}		}

	if (params->mode == V4L2_TUNER_RADIO) {		if (params->mode == V4L2_TUNER_RADIO) {
	priv->tda8290_easy_mode = 0x01; /* Start with MN values */		/* Set TDA8295 to FM radio; Start TDA8290 with MN values */
			priv->tda8290_easy_mode = (priv->ver & TDA8295) ? 0x80 : 0x01;
	tuner_dbg("setting to radio FM\n");		tuner_dbg("setting to radio FM\n");
	} else {		} else {
	tuner_dbg("setting tda829x to system %s\n", mode);		tuner_dbg("setting tda829x to system %s\n", mode);
	@@ -672,16 +673,19 @@ static int tda8290_probe(struct tuner_i2c_props *i2c_props)
	static int tda8295_probe(struct tuner_i2c_props *i2c_props)		static int tda8295_probe(struct tuner_i2c_props *i2c_props)
	{		{
	#define TDA8295_ID 0x8a		#define TDA8295_ID 0x8a
			#define TDA8295C2_ID 0x8b
	unsigned char tda8295_id[] = { 0x2f, 0x00 };		unsigned char tda8295_id[] = { 0x2f, 0x00 };

	/* detect tda8295 */		/* detect tda8295 */
	tuner_i2c_xfer_send(i2c_props, &tda8295_id[0], 1);		tuner_i2c_xfer_send(i2c_props, &tda8295_id[0], 1);
	tuner_i2c_xfer_recv(i2c_props, &tda8295_id[1], 1);		tuner_i2c_xfer_recv(i2c_props, &tda8295_id[1], 1);

	if (tda8295_id[1] == TDA8295_ID) {		if ((tda8295_id[1] & 0xfe) == TDA8295_ID) {
	if (debug)		if (debug)
	printk(KERN_DEBUG "%s: tda8295 detected @ %d-%04x\n",		printk(KERN_DEBUG "%s: %s detected @ %d-%04x\n",
	__func__, i2c_adapter_id(i2c_props->adap),		__func__, (tda8295_id[1] == TDA8295_ID) ?
			"tda8295c1" : "tda8295c2",
			i2c_adapter_id(i2c_props->adap),
	i2c_props->addr);		i2c_props->addr);
	return 0;		return 0;
	}		}

drivers/media/dvb/frontends/dib8000.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -100,7 +100,7 @@ static inline int dib8000_set_tune_state(struct dvb_frontend *fe, enum frontend_
	static inline enum frontend_tune_state dib8000_get_tune_state(struct dvb_frontend *fe)		static inline enum frontend_tune_state dib8000_get_tune_state(struct dvb_frontend *fe)
	{		{
	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);		printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
	return CT_SHUTDOWN,		return CT_SHUTDOWN;
	}		}
	static inline void dib8000_pwm_agc_reset(struct dvb_frontend *fe)		static inline void dib8000_pwm_agc_reset(struct dvb_frontend *fe)
	{		{