diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-18 15:53:54 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-18 15:53:54 -0500 |
| commit | 4a7c1ff2362b7bfbc04990f42c21cefdff57f997 (patch) | |
| tree | 82ac9c30ca95b6a92084f5535e6406866eb99cf3 /drivers/media/video/cx88 | |
| parent | 9278e634b4e063f415b46923a9ca4e74f42ec932 (diff) | |
| parent | 36be126cb0ebe3000a65c1049f339a3e882a9a47 (diff) | |
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (57 commits)
[media] as3645a: Fix compilation by including slab.h
[media] s5p-fimc: Remove linux/version.h include from fimc-mdevice.c
[media] s5p-mfc: Remove linux/version.h include from s5p_mfc.c
[media] ds3000: using logical && instead of bitwise &
[media] v4l2-ctrls: make control names consistent
[media] DVB: dib0700, add support for Nova-TD LEDs
[media] DVB: dib0700, add corrected Nova-TD frontend_attach
[media] DVB: dib0700, separate stk7070pd initialization
[media] DVB: dib0700, move Nova-TD Stick to a separate set
[media] : add MODULE_FIRMWARE to dib0700
[media] DVB-CORE: remove superfluous DTV_CMDs
[media] s5p-jpeg: adapt to recent videobuf2 changes
[media] s5p-g2d: fixed a bug in controls setting function
[media] s5p-mfc: Fix volatile controls setup
[media] drivers/media/video/s5p-mfc/s5p_mfc.c: adjust double test
[media] drivers/media/video/s5p-fimc/fimc-capture.c: adjust double test
[media] s5p-fimc: Fix incorrect control ID assignment
[media] dvb_frontend: Don't call get_frontend() if idle
[media] DocBook/dvbproperty.xml: Remove DTV_MODULATION from ISDB-T
[media] DocBook/dvbproperty.xml: Fix ISDB-T delivery system parameters
...
Diffstat (limited to 'drivers/media/video/cx88')
| -rw-r--r-- | drivers/media/video/cx88/cx88-cards.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c index 62c7ad050f9..cbd5d119a2c 100644 --- a/drivers/media/video/cx88/cx88-cards.c +++ b/drivers/media/video/cx88/cx88-cards.c | |||
| @@ -1573,8 +1573,8 @@ static const struct cx88_board cx88_boards[] = { | |||
| 1573 | .name = "Pinnacle Hybrid PCTV", | 1573 | .name = "Pinnacle Hybrid PCTV", |
| 1574 | .tuner_type = TUNER_XC2028, | 1574 | .tuner_type = TUNER_XC2028, |
| 1575 | .tuner_addr = 0x61, | 1575 | .tuner_addr = 0x61, |
| 1576 | .radio_type = TUNER_XC2028, | 1576 | .radio_type = UNSET, |
| 1577 | .radio_addr = 0x61, | 1577 | .radio_addr = ADDR_UNSET, |
| 1578 | .input = { { | 1578 | .input = { { |
| 1579 | .type = CX88_VMUX_TELEVISION, | 1579 | .type = CX88_VMUX_TELEVISION, |
| 1580 | .vmux = 0, | 1580 | .vmux = 0, |
| @@ -1611,8 +1611,8 @@ static const struct cx88_board cx88_boards[] = { | |||
| 1611 | .name = "Leadtek TV2000 XP Global", | 1611 | .name = "Leadtek TV2000 XP Global", |
| 1612 | .tuner_type = TUNER_XC2028, | 1612 | .tuner_type = TUNER_XC2028, |
| 1613 | .tuner_addr = 0x61, | 1613 | .tuner_addr = 0x61, |
| 1614 | .radio_type = TUNER_XC2028, | 1614 | .radio_type = UNSET, |
| 1615 | .radio_addr = 0x61, | 1615 | .radio_addr = ADDR_UNSET, |
| 1616 | .input = { { | 1616 | .input = { { |
| 1617 | .type = CX88_VMUX_TELEVISION, | 1617 | .type = CX88_VMUX_TELEVISION, |
| 1618 | .vmux = 0, | 1618 | .vmux = 0, |
| @@ -2115,8 +2115,8 @@ static const struct cx88_board cx88_boards[] = { | |||
| 2115 | .name = "Terratec Cinergy HT PCI MKII", | 2115 | .name = "Terratec Cinergy HT PCI MKII", |
| 2116 | .tuner_type = TUNER_XC2028, | 2116 | .tuner_type = TUNER_XC2028, |
| 2117 | .tuner_addr = 0x61, | 2117 | .tuner_addr = 0x61, |
| 2118 | .radio_type = TUNER_XC2028, | 2118 | .radio_type = UNSET, |
| 2119 | .radio_addr = 0x61, | 2119 | .radio_addr = ADDR_UNSET, |
| 2120 | .input = { { | 2120 | .input = { { |
| 2121 | .type = CX88_VMUX_TELEVISION, | 2121 | .type = CX88_VMUX_TELEVISION, |
| 2122 | .vmux = 0, | 2122 | .vmux = 0, |
| @@ -2154,9 +2154,9 @@ static const struct cx88_board cx88_boards[] = { | |||
| 2154 | [CX88_BOARD_WINFAST_DTV1800H] = { | 2154 | [CX88_BOARD_WINFAST_DTV1800H] = { |
| 2155 | .name = "Leadtek WinFast DTV1800 Hybrid", | 2155 | .name = "Leadtek WinFast DTV1800 Hybrid", |
| 2156 | .tuner_type = TUNER_XC2028, | 2156 | .tuner_type = TUNER_XC2028, |
| 2157 | .radio_type = TUNER_XC2028, | 2157 | .radio_type = UNSET, |
| 2158 | .tuner_addr = 0x61, | 2158 | .tuner_addr = 0x61, |
| 2159 | .radio_addr = 0x61, | 2159 | .radio_addr = ADDR_UNSET, |
| 2160 | /* | 2160 | /* |
| 2161 | * GPIO setting | 2161 | * GPIO setting |
| 2162 | * | 2162 | * |
| @@ -2195,9 +2195,9 @@ static const struct cx88_board cx88_boards[] = { | |||
| 2195 | [CX88_BOARD_WINFAST_DTV1800H_XC4000] = { | 2195 | [CX88_BOARD_WINFAST_DTV1800H_XC4000] = { |
| 2196 | .name = "Leadtek WinFast DTV1800 H (XC4000)", | 2196 | .name = "Leadtek WinFast DTV1800 H (XC4000)", |
| 2197 | .tuner_type = TUNER_XC4000, | 2197 | .tuner_type = TUNER_XC4000, |
| 2198 | .radio_type = TUNER_XC4000, | 2198 | .radio_type = UNSET, |
| 2199 | .tuner_addr = 0x61, | 2199 | .tuner_addr = 0x61, |
| 2200 | .radio_addr = 0x61, | 2200 | .radio_addr = ADDR_UNSET, |
| 2201 | /* | 2201 | /* |
| 2202 | * GPIO setting | 2202 | * GPIO setting |
| 2203 | * | 2203 | * |
| @@ -2236,9 +2236,9 @@ static const struct cx88_board cx88_boards[] = { | |||
| 2236 | [CX88_BOARD_WINFAST_DTV2000H_PLUS] = { | 2236 | [CX88_BOARD_WINFAST_DTV2000H_PLUS] = { |
| 2237 | .name = "Leadtek WinFast DTV2000 H PLUS", | 2237 | .name = "Leadtek WinFast DTV2000 H PLUS", |
| 2238 | .tuner_type = TUNER_XC4000, | 2238 | .tuner_type = TUNER_XC4000, |
| 2239 | .radio_type = TUNER_XC4000, | 2239 | .radio_type = UNSET, |
| 2240 | .tuner_addr = 0x61, | 2240 | .tuner_addr = 0x61, |
| 2241 | .radio_addr = 0x61, | 2241 | .radio_addr = ADDR_UNSET, |
| 2242 | /* | 2242 | /* |
| 2243 | * GPIO | 2243 | * GPIO |
| 2244 | * 2: 1: mute audio | 2244 | * 2: 1: mute audio |