Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 261482
b: refs/heads/master
c: 6c50b66
h: refs/heads/master
v: v3
  • Loading branch information
Oliver Endriss authored and Mauro Carvalho Chehab committed Jul 27, 2011
1 parent 6ca4000 commit 9bad6b8
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d9396b8410a43347933a0ee0ae8b2eb9492f4bc2
refs/heads/master: 6c50b666a5d76b7f03961427a1e7d566e689caa3
8 changes: 4 additions & 4 deletions trunk/drivers/media/dvb/ngene/ngene-cards.c
Original file line number Diff line number Diff line change
Expand Up @@ -426,9 +426,9 @@ static struct ngene_info ngene_info_cineS2v5 = {
};


static struct ngene_info ngene_info_duoFlexS2 = {
static struct ngene_info ngene_info_duoFlex = {
.type = NGENE_SIDEWINDER,
.name = "Digital Devices DuoFlex S2 miniPCIe",
.name = "Digital Devices DuoFlex PCIe or miniPCIe",
.io_type = {NGENE_IO_TSIN, NGENE_IO_TSIN, NGENE_IO_TSIN, NGENE_IO_TSIN,
NGENE_IO_TSOUT},
.demod_attach = {cineS2_probe, cineS2_probe, cineS2_probe, cineS2_probe},
Expand Down Expand Up @@ -480,8 +480,8 @@ static const struct pci_device_id ngene_id_tbl[] __devinitdata = {
NGENE_ID(0x18c3, 0xdb01, ngene_info_satixS2),
NGENE_ID(0x18c3, 0xdb02, ngene_info_satixS2v2),
NGENE_ID(0x18c3, 0xdd00, ngene_info_cineS2v5),
NGENE_ID(0x18c3, 0xdd10, ngene_info_duoFlexS2),
NGENE_ID(0x18c3, 0xdd20, ngene_info_duoFlexS2),
NGENE_ID(0x18c3, 0xdd10, ngene_info_duoFlex),
NGENE_ID(0x18c3, 0xdd20, ngene_info_duoFlex),
NGENE_ID(0x1461, 0x062e, ngene_info_m780),
{0}
};
Expand Down

0 comments on commit 9bad6b8

Please sign in to comment.