Commit bd693f68 authored by Michael Bunk's avatar Michael Bunk Committed by Mauro Carvalho Chehab

media: dw2102: Dont't list TT Cinergy S2 R4 twice

"modinfo dvb-usb-dw2102|grep 0105" returns two lines, because the module
reports this usb alias twice.

Remove one of them.
Signed-off-by: default avatarMichael Bunk <micha@freedict.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 0e148a52
...@@ -1833,7 +1833,6 @@ enum dw2102_table_entry { ...@@ -1833,7 +1833,6 @@ enum dw2102_table_entry {
TECHNOTREND_CONNECT_S2_4600, TECHNOTREND_CONNECT_S2_4600,
TEVII_S482_1, TEVII_S482_1,
TEVII_S482_2, TEVII_S482_2,
TERRATEC_CINERGY_S2_BOX,
TEVII_S662 TEVII_S662
}; };
...@@ -1866,7 +1865,6 @@ static struct usb_device_id dw2102_table[] = { ...@@ -1866,7 +1865,6 @@ static struct usb_device_id dw2102_table[] = {
DVB_USB_DEV(TECHNOTREND, TECHNOTREND_CONNECT_S2_4600), DVB_USB_DEV(TECHNOTREND, TECHNOTREND_CONNECT_S2_4600),
DVB_USB_DEV(TEVII, TEVII_S482_1), DVB_USB_DEV(TEVII, TEVII_S482_1),
DVB_USB_DEV(TEVII, TEVII_S482_2), DVB_USB_DEV(TEVII, TEVII_S482_2),
DVB_USB_DEV(TERRATEC, TERRATEC_CINERGY_S2_BOX),
DVB_USB_DEV(TEVII, TEVII_S662), DVB_USB_DEV(TEVII, TEVII_S662),
{ } { }
}; };
...@@ -2577,7 +2575,7 @@ static struct dvb_usb_device_properties tt_s2_4600_properties = { ...@@ -2577,7 +2575,7 @@ static struct dvb_usb_device_properties tt_s2_4600_properties = {
{ NULL }, { NULL },
}, },
{ "Terratec Cinergy S2 USB BOX", { "Terratec Cinergy S2 USB BOX",
{ &dw2102_table[TERRATEC_CINERGY_S2_BOX], NULL }, { &dw2102_table[TERRATEC_CINERGY_S2_R4], NULL },
{ NULL }, { NULL },
}, },
{ "TeVii S662", { "TeVii S662",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment