From 989827e2b107b593489734fd1e8cdbcb12490a80 Mon Sep 17 00:00:00 2001
From: Devin Heitmueller <dheitmueller@kernellabs.com>
Date: Sun, 20 Dec 2009 23:50:02 -0300
Subject: [PATCH] --- yaml --- r: 181567 b: refs/heads/master c:
 71036ef26b0026742c8ab79a54937aac1439350d h: refs/heads/master i:   181565:
 fb9d6aa795d484c9d642fa6a0fc4c8a0b756e0a7   181563:
 970e1381a5a2f8754c0f0a29dc0e083d203597a1   181559:
 fc6cb7fa0ca022ddbb3566a8ae44b56d4ee30c9d   181551:
 95d7ea42812fd8e14caa4e2028268418ce9d44a3   181535:
 3c64c98768dd7358e8a06e6d164f51c38f822a1d   181503:
 0b9295fa6c0ddcd6d1427281ae022e7e9da960eb v: v3

---
 [refs]                                         | 2 +-
 trunk/drivers/media/video/cx18/cx18-alsa-pcm.c | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 5426eb8a3c84..57956e2d027e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f8bd9d26c59d0df0335bf43191feb732f2c8b6ad
+refs/heads/master: 71036ef26b0026742c8ab79a54937aac1439350d
diff --git a/trunk/drivers/media/video/cx18/cx18-alsa-pcm.c b/trunk/drivers/media/video/cx18/cx18-alsa-pcm.c
index 371dfb8d8756..2d25c6f92d5d 100644
--- a/trunk/drivers/media/video/cx18/cx18-alsa-pcm.c
+++ b/trunk/drivers/media/video/cx18/cx18-alsa-pcm.c
@@ -37,11 +37,13 @@
 #include "cx18-fileops.h"
 #include "cx18-alsa.h"
 
-extern int cx18_alsa_debug;
+static unsigned int pcm_debug;
+module_param(pcm_debug, int, 0644);
+MODULE_PARM_DESC(pcm_debug, "enable debug messages for pcm");
 
 #define dprintk(fmt, arg...) do {					\
-	    if (cx18_alsa_debug)					\
-		printk(KERN_INFO "cx18-alsa %s: " fmt,			\
+	    if (pcm_debug)						\
+		printk(KERN_INFO "cx18-alsa-pcm %s: " fmt,		\
 				  __func__, ##arg); 			\
 	} while (0)