diff options
| author | Manuel Capinha <mcapinha@gmail.com> | 2005-06-24 01:04:53 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-24 03:06:38 -0400 |
| commit | 239df2e2b0e1f4f69fdf76fb67e865824029e8ab (patch) | |
| tree | 57088068f1f464c9d1c71f9a4e9dccfcd5106c66 /drivers/media/video/cx88/cx88.h | |
| parent | d81ef559daf2a8afa9292035d58b00e7cb23dd1a (diff) | |
[PATCH] v4l: add support for PixelView Ultra Pro
The following patch adds support for the PixelView Ultra Pro video capture
card in v4l.
- It removes the remote control key definitions from ir-kbd-gpio.c and
moves them to ir-common.c so that they can be shared between bt878 and
cx88 based cards.
- The patch also moves the FUSIONHDTV_3_GOLD_Q card from number 27 to 28
to regain compatibility with the V4L cvs.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media/video/cx88/cx88.h')
| -rw-r--r-- | drivers/media/video/cx88/cx88.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h index 0ea24b72d927..7fca1f500c56 100644 --- a/drivers/media/video/cx88/cx88.h +++ b/drivers/media/video/cx88/cx88.h | |||
| @@ -162,7 +162,8 @@ extern struct sram_channel cx88_sram_channels[]; | |||
| 162 | #define CX88_BOARD_HAUPPAUGE_ROSLYN 24 | 162 | #define CX88_BOARD_HAUPPAUGE_ROSLYN 24 |
| 163 | #define CX88_BOARD_DIGITALLOGIC_MEC 25 | 163 | #define CX88_BOARD_DIGITALLOGIC_MEC 25 |
| 164 | #define CX88_BOARD_IODATA_GVBCTV7E 26 | 164 | #define CX88_BOARD_IODATA_GVBCTV7E 26 |
| 165 | #define CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_Q 27 | 165 | #define CX88_BOARD_PIXELVIEW_PLAYTV_ULTRA_PRO 27 |
| 166 | #define CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_Q 28 | ||
| 166 | 167 | ||
| 167 | enum cx88_itype { | 168 | enum cx88_itype { |
| 168 | CX88_VMUX_COMPOSITE1 = 1, | 169 | CX88_VMUX_COMPOSITE1 = 1, |