Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 13319
b: refs/heads/master
c: 0bcc37c
h: refs/heads/master
i:
  13317: 751bf83
  13315: c3d3886
  13311: 8c11522
v: v3
  • Loading branch information
Alexander Wold authored and Linus Torvalds committed Nov 9, 2005
1 parent 4f5c014 commit fd5c936
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: afce892f66c196989fe7d938150201d337c553e5
refs/heads/master: 0bcc37c328ac66ede45a6672f85795eee0b05b87
20 changes: 20 additions & 0 deletions trunk/drivers/media/video/cx88/cx88-cards.c
Original file line number Diff line number Diff line change
Expand Up @@ -803,6 +803,26 @@ struct cx88_board cx88_boards[] = {
.gpio0 = 0x0000cdf3,
},
},
[CX88_BOARD_KWORLD_VSTREAM_EXPERT_DVD] = {
/* Alexander Wold <awold@bigfoot.com> */
.name = "Kworld V-Stream Xpert DVD",
.tuner_type = UNSET,
.input = {{
.type = CX88_VMUX_COMPOSITE1,
.vmux = 1,
.gpio0 = 0x03000000,
.gpio1 = 0x01000000,
.gpio2 = 0x02000000,
.gpio3 = 0x00100000,
},{
.type = CX88_VMUX_SVIDEO,
.vmux = 2,
.gpio0 = 0x03000000,
.gpio1 = 0x01000000,
.gpio2 = 0x02000000,
.gpio3 = 0x00100000,
}},
},
};
const unsigned int cx88_bcount = ARRAY_SIZE(cx88_boards);

Expand Down
1 change: 1 addition & 0 deletions trunk/drivers/media/video/cx88/cx88.h
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@ extern struct sram_channel cx88_sram_channels[];
#define CX88_BOARD_TERRATEC_CINERGY_1400_DVB_T1 30
#define CX88_BOARD_DVICO_FUSIONHDTV_5_GOLD 31
#define CX88_BOARD_AVERMEDIA_ULTRATV_MC_550 32
#define CX88_BOARD_KWORLD_VSTREAM_EXPERT_DVD 33

enum cx88_itype {
CX88_VMUX_COMPOSITE1 = 1,
Expand Down

0 comments on commit fd5c936

Please sign in to comment.