Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / media / video / saa7134 / saa7134-tvaudio.c

diff --git a/drivers/media/video/saa7134/saa7134-tvaudio.c b/drivers/media/video/saa7134/saa7134-tvaudio.c
index 3e7d2fd1688f3b27b669e7e603bd76c04f6958c6..57e646bb48b394008e42b686922dc3233554fb9f 100644 (file)
--- a/drivers/media/video/saa7134/saa7134-tvaudio.c
+++ b/drivers/media/video/saa7134/saa7134-tvaudio.c
@@ -550,16 +550,16 @@ static int tvaudio_thread(void *data)
                } else if (0 != dev->last_carrier) {
                        /* no carrier -- try last detected one as fallback */
                        carrier = dev->last_carrier;
-                       dprintk(KERN_WARNING "%s/audio: audio carrier scan failed, "
-                              "using %d.%03d MHz [last detected]\n",
-                              dev->name, carrier/1000, carrier%1000);
+                       dprintk("audio carrier scan failed, "
+                               "using %d.%03d MHz [last detected]\n",
+                               carrier/1000, carrier%1000);
 
                } else {
                        /* no carrier + no fallback -- use default */
                        carrier = default_carrier;
-                       dprintk(KERN_WARNING "%s/audio: audio carrier scan failed, "
-                              "using %d.%03d MHz [default]\n",
-                              dev->name, carrier/1000, carrier%1000);
+                       dprintk("audio carrier scan failed, "
+                               "using %d.%03d MHz [default]\n",
+                               carrier/1000, carrier%1000);
                }
                tvaudio_setcarrier(dev,carrier,carrier);
                dev->automute = 0;