From 6204abb40c356baf4bf6a7630e4db2d3264391f8 Mon Sep 17 00:00:00 2001
From: Antti Palosaari <crope@iki.fi>
Date: Thu, 9 Sep 2010 12:10:50 -0300
Subject: [PATCH] --- yaml --- r: 219091 b: refs/heads/master c:
 76391a71543ba0c45e634b31cc33cef1e1be8e79 h: refs/heads/master i:   219089:
 88dd2f2729469826abbbda591d21036d43af6cdb   219087:
 dd5d0c5e8397e6258a042ee9cb49dae51b34afec v: v3

---
 [refs]                                   |  2 +-
 trunk/drivers/media/dvb/dvb-usb/af9015.c | 25 ++++++------------------
 2 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/[refs] b/[refs]
index 53e4f8f9afe5..5d3e8b8b6ecf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a44b91d9fe02a96b8d53863a1653bd4c14a31ea7
+refs/heads/master: 76391a71543ba0c45e634b31cc33cef1e1be8e79
diff --git a/trunk/drivers/media/dvb/dvb-usb/af9015.c b/trunk/drivers/media/dvb/dvb-usb/af9015.c
index 754b126ed176..b5fdcc2cb543 100644
--- a/trunk/drivers/media/dvb/dvb-usb/af9015.c
+++ b/trunk/drivers/media/dvb/dvb-usb/af9015.c
@@ -1370,7 +1370,7 @@ static struct dvb_usb_device_properties af9015_properties[] = {
 
 		.i2c_algo = &af9015_i2c_algo,
 
-		.num_device_descs = 9, /* check max from dvb-usb.h */
+		.num_device_descs = 10, /* check max from dvb-usb.h */
 		.devices = {
 			{
 				.name = "Afatech AF9015 DVB-T USB2.0 stick",
@@ -1422,6 +1422,11 @@ static struct dvb_usb_device_properties af9015_properties[] = {
 				.cold_ids = {&af9015_usb_table[9], NULL},
 				.warm_ids = {NULL},
 			},
+			{
+				.name = "TerraTec Cinergy T Stick RC",
+				.cold_ids = {&af9015_usb_table[33], NULL},
+				.warm_ids = {NULL},
+			},
 		}
 	}, {
 		.caps = DVB_USB_IS_AN_I2C_ADAPTER,
@@ -1638,24 +1643,6 @@ static struct dvb_usb_device_properties af9015_properties[] = {
 				.cold_ids = {&af9015_usb_table[32], NULL},
 				.warm_ids = {NULL},
 			},
-		},
-
-		.identify_state = af9015_identify_state,
-
-		.rc.legacy = {
-			.rc_query         = af9015_rc_query,
-			.rc_interval      = 150,
-		},
-
-		.i2c_algo = &af9015_i2c_algo,
-
-		.num_device_descs = 1, /* check max from dvb-usb.h */
-		.devices = {
-			{
-				.name = "TerraTec Cinergy T Stick RC",
-				.cold_ids = {&af9015_usb_table[33], NULL},
-				.warm_ids = {NULL},
-			},
 		}
 	},
 };