From 72c8f45cd1fa33e55696accf64167bd10cefc7a2 Mon Sep 17 00:00:00 2001
From: Ricardo Cerqueira <v4l@cerqueira.org>
Date: Sun, 18 Jun 2006 00:21:49 -0300
Subject: [PATCH] --- yaml --- r: 30019 b: refs/heads/master c:
 b63535f4058eca81b64485c885610008784d2bb0 h: refs/heads/master i:   30017:
 6dc3787792b8683168cb4b0455726fde5b243193   30015:
 21b5adf9455e77fc0e356c4deb327e115b759732 v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/media/video/cx88/cx88-tvaudio.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 4f28b1ee98fa..092318b70f6f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0f4b56807b443927600112c1351a181ce664929c
+refs/heads/master: b63535f4058eca81b64485c885610008784d2bb0
diff --git a/trunk/drivers/media/video/cx88/cx88-tvaudio.c b/trunk/drivers/media/video/cx88/cx88-tvaudio.c
index 256ae8515d2b..c43e59047930 100644
--- a/trunk/drivers/media/video/cx88/cx88-tvaudio.c
+++ b/trunk/drivers/media/video/cx88/cx88-tvaudio.c
@@ -137,12 +137,12 @@ static void set_audio_finish(struct cx88_core *core, u32 ctl)
 {
 	u32 volume;
 
-#ifndef USING_CX88_ALSA
+#ifndef CONFIG_VIDEO_CX88_ALSA
 	/* restart dma; This avoids buzz in NICAM and is good in others  */
 	cx88_stop_audio_dma(core);
 #endif
 	cx_write(AUD_RATE_THRES_DMD, 0x000000C0);
-#ifndef USING_CX88_ALSA
+#ifndef CONFIG_VIDEO_CX88_ALSA
 	cx88_start_audio_dma(core);
 #endif