summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/cx88/cx88-tvaudio.c
diff options
context:
space:
mode:
authorMichael Krufky <mkrufky@linuxtv.org>2006-09-25 13:09:10 -0400
committerMichael Krufky <mkrufky@linuxtv.org>2006-09-25 13:09:10 -0400
commit8ad4a996f0de03ee5772c3db6680416a28cfc8a3 (patch)
tree25efe2fb46fa2a9979fe9c5ec8674fe5e491bd97 /linux/drivers/media/video/cx88/cx88-tvaudio.c
parentb887c4748e26f436ab35da8d0cb12baa4c0d2426 (diff)
downloadmediapointer-dvb-s2-8ad4a996f0de03ee5772c3db6680416a28cfc8a3.tar.gz
mediapointer-dvb-s2-8ad4a996f0de03ee5772c3db6680416a28cfc8a3.tar.bz2
cx88: rename mpeg capability flags from CX88_BOARD_FOO to CX88_MPEG_FOO
From: Michael Krufky <mkrufky@linuxtv.org> 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> CC: Steven Toth <stoth@hauppauge.com> Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
Diffstat (limited to 'linux/drivers/media/video/cx88/cx88-tvaudio.c')
-rw-r--r--linux/drivers/media/video/cx88/cx88-tvaudio.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-tvaudio.c b/linux/drivers/media/video/cx88/cx88-tvaudio.c
index b2272a1c6..6528c05d0 100644
--- a/linux/drivers/media/video/cx88/cx88-tvaudio.c
+++ b/linux/drivers/media/video/cx88/cx88-tvaudio.c
@@ -145,7 +145,7 @@ static void set_audio_finish(struct cx88_core *core, u32 ctl)
cx_write(AUD_RATE_THRES_DMD, 0x000000C0);
cx88_start_audio_dma(core);
- if (cx88_boards[core->board].mpeg & CX88_BOARD_BLACKBIRD) {
+ if (cx88_boards[core->board].mpeg & CX88_MPEG_BLACKBIRD) {
/* sets sound input from external adc */
switch (core->board) {
case CX88_BOARD_HAUPPAUGE_ROSLYN:
@@ -167,7 +167,7 @@ static void set_audio_finish(struct cx88_core *core, u32 ctl)
cx_write(AUD_I2SCNTL, 0);
/* cx_write(AUD_APB_IN_RATE_ADJ, 0); */
}
- if ((always_analog) || (!(cx88_boards[core->board].mpeg & CX88_BOARD_BLACKBIRD))) {
+ if ((always_analog) || (!(cx88_boards[core->board].mpeg & CX88_MPEG_BLACKBIRD))) {
ctl |= EN_DAC_ENABLE;
cx_write(AUD_CTL, ctl);
}