diff options
author | Michael Krufky <mkrufky@linuxtv.org> | 2006-09-25 13:09:10 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-10-03 14:13:56 -0400 |
commit | 48d5e8031e45545d353cb81a8f52c727deea88c0 (patch) | |
tree | a38ebac87b8876708365830c7d47f7e18164f260 /drivers/media/video/cx88/cx88-tvaudio.c | |
parent | 3a5ba52a1a1981c51af8f3559c16feaa238b2fec (diff) |
V4L/DVB (4668): Cx88: rename mpeg capability flags from CX88_BOARD_FOO to CX88_MPEG_FOO
The flags for mpeg capabilities are sub-optimally named as
CX88_BOARD_DVB and CX88_BOARD_BLACKBIRD, which creates some confusion.
This patch renames the above to CX88_MPEG_DVB and CX88_MPEG_BLACKBIRD.
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/cx88/cx88-tvaudio.c')
-rw-r--r-- | drivers/media/video/cx88/cx88-tvaudio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/cx88/cx88-tvaudio.c b/drivers/media/video/cx88/cx88-tvaudio.c index b6e2bf953cd..58ba9f77352 100644 --- a/drivers/media/video/cx88/cx88-tvaudio.c +++ b/drivers/media/video/cx88/cx88-tvaudio.c | |||
@@ -142,7 +142,7 @@ static void set_audio_finish(struct cx88_core *core, u32 ctl) | |||
142 | cx_write(AUD_RATE_THRES_DMD, 0x000000C0); | 142 | cx_write(AUD_RATE_THRES_DMD, 0x000000C0); |
143 | cx88_start_audio_dma(core); | 143 | cx88_start_audio_dma(core); |
144 | 144 | ||
145 | if (cx88_boards[core->board].mpeg & CX88_BOARD_BLACKBIRD) { | 145 | if (cx88_boards[core->board].mpeg & CX88_MPEG_BLACKBIRD) { |
146 | /* sets sound input from external adc */ | 146 | /* sets sound input from external adc */ |
147 | switch (core->board) { | 147 | switch (core->board) { |
148 | case CX88_BOARD_HAUPPAUGE_ROSLYN: | 148 | case CX88_BOARD_HAUPPAUGE_ROSLYN: |
@@ -164,7 +164,7 @@ static void set_audio_finish(struct cx88_core *core, u32 ctl) | |||
164 | cx_write(AUD_I2SCNTL, 0); | 164 | cx_write(AUD_I2SCNTL, 0); |
165 | /* cx_write(AUD_APB_IN_RATE_ADJ, 0); */ | 165 | /* cx_write(AUD_APB_IN_RATE_ADJ, 0); */ |
166 | } | 166 | } |
167 | if ((always_analog) || (!(cx88_boards[core->board].mpeg & CX88_BOARD_BLACKBIRD))) { | 167 | if ((always_analog) || (!(cx88_boards[core->board].mpeg & CX88_MPEG_BLACKBIRD))) { |
168 | ctl |= EN_DAC_ENABLE; | 168 | ctl |= EN_DAC_ENABLE; |
169 | cx_write(AUD_CTL, ctl); | 169 | cx_write(AUD_CTL, ctl); |
170 | } | 170 | } |