V4L/DVB: af9015: fix bug introduced by commit 490ade7e3f4474f626a8f5d778ead4e599b94fbc

Commit 490ade7e3f4474f626a8f5d778ead4e599b94fbc	merge conflict fix
leads situation	where last nine device definitions were overridden mistakenly.

Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

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},
-			},
 		}
 	},
 };