merge: http://linuxtv.org/hg/~mkrufky/fusionhdtv7

From: Mauro Carvalho Chehab <mchehab@infradead.org>

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

3 files changed, 18 insertions, 25 deletions

diff --git a/linux/drivers/media/video/au0828/au0828-cards.c b/linux/drivers/media/video/au0828/au0828-cards.c
index a2a698344..898e12395 100644
--- a/linux/drivers/media/video/au0828/au0828-cards.c
+++ b/linux/drivers/media/video/au0828/au0828-cards.c
@@ -77,8 +77,14 @@ static void hauppauge_eeprom(struct au0828_dev *dev, u8 *eeprom_data)
 
 	/* Make sure we support the board model */
 	switch (tv.model) {
+	case 72000: /* WinTV-HVR950q (Retail, IR, ATSC/QAM */
 	case 72001: /* WinTV-HVR950q (Retail, IR, ATSC/QAM and basic analog video */
+	case 72211: /* WinTV-HVR950q (OEM, IR, ATSC/QAM and basic analog video */
+	case 72221: /* WinTV-HVR950q (OEM, IR, ATSC/QAM and basic analog video */
+	case 72231: /* WinTV-HVR950q (OEM, IR, ATSC/QAM and basic analog video */
+	case 72241: /* WinTV-HVR950q (OEM, No IR, ATSC/QAM and basic analog video */
 	case 72301: /* WinTV-HVR850 (Retail, IR, ATSC and basic analog video */
+	case 72500: /* WinTV-HVR950q (OEM, No IR, ATSC/QAM */
 		break;
 	default:
 		printk(KERN_WARNING "%s: warning: "
@@ -175,6 +181,18 @@ struct usb_device_id au0828_usb_id_table [] = {
 		.driver_info = AU0828_BOARD_HAUPPAUGE_HVR850 },
 	{ USB_DEVICE(0x0fe9, 0xd620),
 		.driver_info = AU0828_BOARD_DVICO_FUSIONHDTV7 },
+	{ USB_DEVICE(0x2040, 0x7210),
+		.driver_info = AU0828_BOARD_HAUPPAUGE_HVR950Q },
+	{ USB_DEVICE(0x2040, 0x7217),
+		.driver_info = AU0828_BOARD_HAUPPAUGE_HVR950Q },
+	{ USB_DEVICE(0x2040, 0x721b),
+		.driver_info = AU0828_BOARD_HAUPPAUGE_HVR950Q },
+	{ USB_DEVICE(0x2040, 0x721f),
+		.driver_info = AU0828_BOARD_HAUPPAUGE_HVR950Q },
+	{ USB_DEVICE(0x2040, 0x7280),
+		.driver_info = AU0828_BOARD_HAUPPAUGE_HVR950Q },
+	{ USB_DEVICE(0x0fd9, 0x0008),
+		.driver_info = AU0828_BOARD_HAUPPAUGE_HVR950Q },
 	{ },
 };
 
diff --git a/linux/drivers/media/video/au0828/au0828-dvb.c b/linux/drivers/media/video/au0828/au0828-dvb.c
index 709a703fe..0a835354f 100644
--- a/linux/drivers/media/video/au0828/au0828-dvb.c
+++ b/linux/drivers/media/video/au0828/au0828-dvb.c
@@ -224,17 +224,10 @@ static int dvb_register(struct au0828_dev *dev)
 		       "(errno = %d)\n", DRIVER_NAME, result);
 		goto fail_adapter;
 	}
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 12))
 	dvb->adapter.priv = dev;
 
 	/* register frontend */
 	result = dvb_register_frontend(&dvb->adapter, dvb->frontend);
-#else
-	dvb->adapter->priv = dev;
-
-	/* register frontend */
-	result = dvb_register_frontend(dvb->adapter, dvb->frontend);
-#endif
 	if (result < 0) {
 		printk(KERN_ERR "%s: dvb_register_frontend failed "
 		       "(errno = %d)\n", DRIVER_NAME, result);
@@ -260,11 +253,7 @@ static int dvb_register(struct au0828_dev *dev)
 	dvb->dmxdev.filternum    = 256;
 	dvb->dmxdev.demux        = &dvb->demux.dmx;
 	dvb->dmxdev.capabilities = 0;
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 12))
 	result = dvb_dmxdev_init(&dvb->dmxdev, &dvb->adapter);
-#else
-	result = dvb_dmxdev_init(&dvb->dmxdev, dvb->adapter);
-#endif
 	if (result < 0) {
 		printk(KERN_ERR "%s: dvb_dmxdev_init failed (errno = %d)\n",
 		       DRIVER_NAME, result);
@@ -295,11 +284,7 @@ static int dvb_register(struct au0828_dev *dev)
 	}
 
 	/* register network adapter */
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 12))
 	dvb_net_init(&dvb->adapter, &dvb->net, &dvb->demux.dmx);
-#else
-	dvb_net_init(dvb->adapter, &dvb->net, &dvb->demux.dmx);
-#endif
 	return 0;
 
 fail_fe_conn:
@@ -314,11 +299,7 @@ fail_dmx:
 	dvb_unregister_frontend(dvb->frontend);
 fail_frontend:
 	dvb_frontend_detach(dvb->frontend);
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 12))
 	dvb_unregister_adapter(&dvb->adapter);
-#else
-	dvb_unregister_adapter(dvb->adapter);
-#endif
 fail_adapter:
 	return result;
 }
@@ -339,11 +320,7 @@ void au0828_dvb_unregister(struct au0828_dev *dev)
 	dvb_dmx_release(&dvb->demux);
 	dvb_unregister_frontend(dvb->frontend);
 	dvb_frontend_detach(dvb->frontend);
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 12))
 	dvb_unregister_adapter(&dvb->adapter);
-#else
-	dvb_unregister_adapter(dvb->adapter);
-#endif
 }
 
 /* All the DVB attach calls go here, this function get's modified
diff --git a/linux/drivers/media/video/au0828/au0828-i2c.c b/linux/drivers/media/video/au0828/au0828-i2c.c
index b40a086e4..32858dceb 100644
--- a/linux/drivers/media/video/au0828/au0828-i2c.c
+++ b/linux/drivers/media/video/au0828/au0828-i2c.c
@@ -307,9 +307,7 @@ static struct i2c_algorithm au0828_i2c_algo_template = {
 
 static struct i2c_adapter au0828_i2c_adap_template = {
 	.name              = DRIVER_NAME,
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
 	.owner             = THIS_MODULE,
-#endif
 	.id                = I2C_HW_B_AU0828,
 	.algo              = &au0828_i2c_algo_template,
 	.class             = I2C_CLASS_TV_ANALOG,