diff options
Diffstat (limited to 'drivers/media/usb/dvb-usb/dw2102.c')
| -rw-r--r-- | drivers/media/usb/dvb-usb/dw2102.c | 19 | 
1 files changed, 17 insertions, 2 deletions
diff --git a/drivers/media/usb/dvb-usb/dw2102.c b/drivers/media/usb/dvb-usb/dw2102.c index 9578a6761f1..6e237b6dd0a 100644 --- a/drivers/media/usb/dvb-usb/dw2102.c +++ b/drivers/media/usb/dvb-usb/dw2102.c @@ -29,7 +29,6 @@  #include "stb6100.h"  #include "stb6100_proc.h"  #include "m88rs2000.h" -#include "ts2020.h"  #ifndef USB_PID_DW2102  #define USB_PID_DW2102 0x2102 @@ -79,6 +78,10 @@  #define USB_PID_TEVII_S632 0xd632  #endif +#ifndef USB_PID_GOTVIEW_SAT_HD +#define USB_PID_GOTVIEW_SAT_HD 0x5456 +#endif +  #define DW210X_READ_MSG 0  #define DW210X_WRITE_MSG 1 @@ -1548,6 +1551,8 @@ enum dw2102_table_entry {  	X3M_SPC1400HD,  	TEVII_S421,  	TEVII_S632, +	TERRATEC_CINERGY_S2_R2, +	GOTVIEW_SAT_HD,  };  static struct usb_device_id dw2102_table[] = { @@ -1568,6 +1573,8 @@ static struct usb_device_id dw2102_table[] = {  	[X3M_SPC1400HD] = {USB_DEVICE(0x1f4d, 0x3100)},  	[TEVII_S421] = {USB_DEVICE(0x9022, USB_PID_TEVII_S421)},  	[TEVII_S632] = {USB_DEVICE(0x9022, USB_PID_TEVII_S632)}, +	[TERRATEC_CINERGY_S2_R2] = {USB_DEVICE(USB_VID_TERRATEC, 0x00b0)}, +	[GOTVIEW_SAT_HD] = {USB_DEVICE(0x1FE1, USB_PID_GOTVIEW_SAT_HD)},  	{ }  }; @@ -1968,7 +1975,7 @@ static struct dvb_usb_device_properties su3000_properties = {  		}},  		}  	}, -	.num_device_descs = 3, +	.num_device_descs = 5,  	.devices = {  		{ "SU3000HD DVB-S USB2.0",  			{ &dw2102_table[GENIATECH_SU3000], NULL }, @@ -1982,6 +1989,14 @@ static struct dvb_usb_device_properties su3000_properties = {  			{ &dw2102_table[X3M_SPC1400HD], NULL },  			{ NULL },  		}, +		{ "Terratec Cinergy S2 USB HD Rev.2", +			{ &dw2102_table[TERRATEC_CINERGY_S2_R2], NULL }, +			{ NULL }, +		}, +		{ "GOTVIEW Satellite HD", +			{ &dw2102_table[GOTVIEW_SAT_HD], NULL }, +			{ NULL }, +		},  	}  };  |