diff options
Diffstat (limited to 'drivers/media/video/cx88/cx88-tvaudio.c')
-rw-r--r-- | drivers/media/video/cx88/cx88-tvaudio.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/media/video/cx88/cx88-tvaudio.c b/drivers/media/video/cx88/cx88-tvaudio.c index 5785c3481579..741e7c5e69ec 100644 --- a/drivers/media/video/cx88/cx88-tvaudio.c +++ b/drivers/media/video/cx88/cx88-tvaudio.c | |||
@@ -52,7 +52,6 @@ | |||
52 | #include <linux/init.h> | 52 | #include <linux/init.h> |
53 | #include <linux/smp_lock.h> | 53 | #include <linux/smp_lock.h> |
54 | #include <linux/delay.h> | 54 | #include <linux/delay.h> |
55 | #include <linux/config.h> | ||
56 | #include <linux/kthread.h> | 55 | #include <linux/kthread.h> |
57 | 56 | ||
58 | #include "cx88.h" | 57 | #include "cx88.h" |
@@ -138,14 +137,10 @@ static void set_audio_finish(struct cx88_core *core, u32 ctl) | |||
138 | { | 137 | { |
139 | u32 volume; | 138 | u32 volume; |
140 | 139 | ||
141 | #ifndef CONFIG_VIDEO_CX88_ALSA | ||
142 | /* restart dma; This avoids buzz in NICAM and is good in others */ | 140 | /* restart dma; This avoids buzz in NICAM and is good in others */ |
143 | cx88_stop_audio_dma(core); | 141 | cx88_stop_audio_dma(core); |
144 | #endif | ||
145 | cx_write(AUD_RATE_THRES_DMD, 0x000000C0); | 142 | cx_write(AUD_RATE_THRES_DMD, 0x000000C0); |
146 | #ifndef CONFIG_VIDEO_CX88_ALSA | ||
147 | cx88_start_audio_dma(core); | 143 | cx88_start_audio_dma(core); |
148 | #endif | ||
149 | 144 | ||
150 | if (cx88_boards[core->board].blackbird) { | 145 | if (cx88_boards[core->board].blackbird) { |
151 | /* sets sound input from external adc */ | 146 | /* sets sound input from external adc */ |