aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/ngene
diff options
context:
space:
mode:
authorOliver Endriss <o.endriss@gmx.de>2010-02-03 11:57:58 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-02-26 13:10:55 -0500
commite890e7c0426ab99b032d5b387b1ca9fad6928895 (patch)
tree2f8a2571ab8e2864be578a0a4c3130f9fb0dfe38 /drivers/media/dvb/ngene
parentace30f74ac1b3f20ab8f98995510a5e0d643c42c (diff)
V4L/DVB: ngene: Use correct name for cineS2 cards
Cards 18c3:abc3/18c3:abc4 should be displayed as 'Linux4Media cineS2'. Signed-off-by: Oliver Endriss <o.endriss@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb/ngene')
-rw-r--r--drivers/media/dvb/ngene/ngene-core.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/media/dvb/ngene/ngene-core.c b/drivers/media/dvb/ngene/ngene-core.c
index 389204b7df11..1bb9bc78573e 100644
--- a/drivers/media/dvb/ngene/ngene-core.c
+++ b/drivers/media/dvb/ngene/ngene-core.c
@@ -1879,7 +1879,7 @@ fail0:
1879/* Card configs *************************************************************/ 1879/* Card configs *************************************************************/
1880/****************************************************************************/ 1880/****************************************************************************/
1881 1881
1882static struct stv090x_config fe_mps2 = { 1882static struct stv090x_config fe_cineS2 = {
1883 .device = STV0900, 1883 .device = STV0900,
1884 .demod_mode = STV090x_DUAL, 1884 .demod_mode = STV090x_DUAL,
1885 .clk_mode = STV090x_CLK_EXT, 1885 .clk_mode = STV090x_CLK_EXT,
@@ -1898,26 +1898,26 @@ static struct stv090x_config fe_mps2 = {
1898 .diseqc_envelope_mode = true, 1898 .diseqc_envelope_mode = true,
1899}; 1899};
1900 1900
1901static struct stv6110x_config tuner_mps2_0 = { 1901static struct stv6110x_config tuner_cineS2_0 = {
1902 .addr = 0x60, 1902 .addr = 0x60,
1903 .refclk = 27000000, 1903 .refclk = 27000000,
1904 .clk_div = 1, 1904 .clk_div = 1,
1905}; 1905};
1906 1906
1907static struct stv6110x_config tuner_mps2_1 = { 1907static struct stv6110x_config tuner_cineS2_1 = {
1908 .addr = 0x63, 1908 .addr = 0x63,
1909 .refclk = 27000000, 1909 .refclk = 27000000,
1910 .clk_div = 1, 1910 .clk_div = 1,
1911}; 1911};
1912 1912
1913static struct ngene_info ngene_info_mps2 = { 1913static struct ngene_info ngene_info_cineS2 = {
1914 .type = NGENE_SIDEWINDER, 1914 .type = NGENE_SIDEWINDER,
1915 .name = "Media-Pointer MP-S2/CineS2 DVB-S2 Twin Tuner", 1915 .name = "Linux4Media cineS2 DVB-S2 Twin Tuner",
1916 .io_type = {NGENE_IO_TSIN, NGENE_IO_TSIN}, 1916 .io_type = {NGENE_IO_TSIN, NGENE_IO_TSIN},
1917 .demod_attach = {demod_attach_stv0900, demod_attach_stv0900}, 1917 .demod_attach = {demod_attach_stv0900, demod_attach_stv0900},
1918 .tuner_attach = {tuner_attach_stv6110, tuner_attach_stv6110}, 1918 .tuner_attach = {tuner_attach_stv6110, tuner_attach_stv6110},
1919 .fe_config = {&fe_mps2, &fe_mps2}, 1919 .fe_config = {&fe_cineS2, &fe_cineS2},
1920 .tuner_config = {&tuner_mps2_0, &tuner_mps2_1}, 1920 .tuner_config = {&tuner_cineS2_0, &tuner_cineS2_1},
1921 .lnb = {0x0b, 0x08}, 1921 .lnb = {0x0b, 0x08},
1922 .tsf = {3, 3}, 1922 .tsf = {3, 3},
1923 .fw_version = 15, 1923 .fw_version = 15,
@@ -1929,8 +1929,8 @@ static struct ngene_info ngene_info_satixs2 = {
1929 .io_type = {NGENE_IO_TSIN, NGENE_IO_TSIN}, 1929 .io_type = {NGENE_IO_TSIN, NGENE_IO_TSIN},
1930 .demod_attach = {demod_attach_stv0900, demod_attach_stv0900}, 1930 .demod_attach = {demod_attach_stv0900, demod_attach_stv0900},
1931 .tuner_attach = {tuner_attach_stv6110, tuner_attach_stv6110}, 1931 .tuner_attach = {tuner_attach_stv6110, tuner_attach_stv6110},
1932 .fe_config = {&fe_mps2, &fe_mps2}, 1932 .fe_config = {&fe_cineS2, &fe_cineS2},
1933 .tuner_config = {&tuner_mps2_0, &tuner_mps2_1}, 1933 .tuner_config = {&tuner_cineS2_0, &tuner_cineS2_1},
1934 .lnb = {0x0b, 0x08}, 1934 .lnb = {0x0b, 0x08},
1935 .tsf = {3, 3}, 1935 .tsf = {3, 3},
1936 .fw_version = 15, 1936 .fw_version = 15,
@@ -1952,8 +1952,8 @@ static struct ngene_info ngene_info_satixs2 = {
1952/****************************************************************************/ 1952/****************************************************************************/
1953 1953
1954static const struct pci_device_id ngene_id_tbl[] __devinitdata = { 1954static const struct pci_device_id ngene_id_tbl[] __devinitdata = {
1955 NGENE_ID(0x18c3, 0xabc3, ngene_info_mps2), 1955 NGENE_ID(0x18c3, 0xabc3, ngene_info_cineS2),
1956 NGENE_ID(0x18c3, 0xabc4, ngene_info_mps2), 1956 NGENE_ID(0x18c3, 0xabc4, ngene_info_cineS2),
1957 NGENE_ID(0x18c3, 0xdb01, ngene_info_satixs2), 1957 NGENE_ID(0x18c3, 0xdb01, ngene_info_satixs2),
1958 {0} 1958 {0}
1959}; 1959};