--- linux-dvb.cvs-20030816.orig/driver/av7110/av7110.c	Mon Aug 18 21:00:38 2003
+++ linux-dvb.cvs-20030816/driver/av7110/av7110.c	Mon Aug 18 20:50:50 2003
@@ -342,7 +342,7 @@
                       saa7146_read(av7110->saa_mem, IER) | MASK_03 );
 
         av7110->arm_ready=1;
-        printk("av7110: ARM RESET\n");
+        printk("DVB: AV711%d(%d): ARM RESET\n", av7110->avtype, av7110->saa->dvb_adapter->num);
 }
 
 static void 
@@ -398,8 +398,8 @@
                 up(&av7110->dcomlock);
 
                 if (newloops==av7110->arm_loops) {
-                        printk(KERN_ERR "av7110%d: ARM crashed!\n",
-				av7110->saa->dvb_adapter->num);
+                        printk(KERN_ERR "DVB: AV711%d(%d): ARM crashed!\n",
+				av7110->avtype, av7110->saa->dvb_adapter->num);
 
 			arm_error(av7110);
 
@@ -2186,16 +2186,16 @@
         av7110->arm_app=(buf[6] << 16) + buf[7];
         av7110->avtype=(buf[8] << 16) + buf[9];
 
-        printk ("DVB: AV711%d(%d) - firm %08x, rtsl %08x, vid %08x, app %08x\n",
+        printk ("DVB: AV711%d(%d): firm %08x, rtsl %08x, vid %08x, app %08x\n",
 		av7110->avtype, av7110->saa->dvb_adapter->num, av7110->arm_fw, 
                 av7110->arm_rtsl, av7110->arm_vid, av7110->arm_app);
 
 	/* print firmware capabilities */
 	if (FW_CI_LL_SUPPORT(av7110->arm_app))
-		printk ("DVB: AV711%d(%d) - firmware supports CI link layer interface\n",
+		printk ("DVB: AV711%d(%d): firmware supports CI link layer interface\n",
 				av7110->avtype, av7110->saa->dvb_adapter->num);
 	else
-		printk ("DVB: AV711%d(%d) - no firmware support for CI link layer interface\n",
+		printk ("DVB: AV711%d(%d): no firmware support for CI link layer interface\n",
 				av7110->avtype, av7110->saa->dvb_adapter->num);
 
         return;
@@ -4979,9 +4979,9 @@
                 bootarm(av7110);
                 firmversion(av7110);
                 if (FW_VERSION(av7110->arm_app)<0x2501) {
-                        printk("av7110: Warning, firmware version 0x%04x is too old. "
+                        printk("DVB: AV711%d(%d): Warning, firmware version 0x%04x is too old. "
 					"System might be unstable!\n",
-					FW_VERSION(av7110->arm_app));
+					av7110->avtype, av7110->saa->dvb_adapter->num, FW_VERSION(av7110->arm_app));
                 }
                 kernel_thread(arm_thread, (void *) av7110, 0);
         } else {
@@ -5000,8 +5000,8 @@
 		/* remaining inits according to card and frontend type */
 
                 if (i2c_writereg(av7110, 0x20, 0x00, 0x00)==1) {
-                        printk("av7110(%d): Crystal audio DAC detected\n",
-				av7110->saa->dvb_adapter->num);
+                        printk("DVB: AV711%d(%d): Crystal audio DAC detected\n",
+				av7110->avtype, av7110->saa->dvb_adapter->num);
                         av7110->adac_type = DVB_ADAC_CRYSTAL;
                         i2c_writereg(av7110, 0x20, 0x01, 0xd2);
                         i2c_writereg(av7110, 0x20, 0x02, 0x49);
@@ -5013,9 +5013,9 @@
 		 */
 		} else if (i2c_writereg(av7110, 0x80, 0x0, 0x80) == 1) {
 			i2c_writereg(av7110, 0x80, 0x0, 0);
-			printk("av7110(%d): DVB-C analog module detected, "
+			printk("DVB: AV711%d(%d): DVB-C analog module detected, "
 			       "initializing MSP3400\n",
-			       av7110->saa->dvb_adapter->num);
+			       av7110->avtype, av7110->saa->dvb_adapter->num);
 			av7110->adac_type = DVB_ADAC_MSP;
 			ddelay(10);
 			msp_writereg(av7110, 0x12, 0x0013, 0x0c00);
@@ -5026,13 +5026,13 @@
 			msp_writereg(av7110, 0x12, 0x0007, 0x7f00); // SCART 1 volume
 			msp_writereg(av7110, 0x12, 0x000d, 0x4800); // prescale SCART
 		} else if (av7110->saa->device->subsystem_vendor == 0x110a) {
-			printk("av7110(%d): DVB-C w/o analog module detected\n",
-			       av7110->saa->dvb_adapter->num);
+			printk("DVB: AV711%d(%d): DVB-C w/o analog module detected\n",
+			       av7110->avtype, av7110->saa->dvb_adapter->num);
 			av7110->adac_type = DVB_ADAC_NONE;
 		} else {
 			av7110->adac_type = adac;
-			printk("av7110(%d): adac type set to %d\n",
-			       av7110->saa->dvb_adapter->num, av7110->adac_type);
+			printk("DVB: AV711%d(%d): adac type set to %d\n",
+			       av7110->avtype, av7110->saa->dvb_adapter->num, av7110->adac_type);
 		}
 
 		if (av7110->adac_type == DVB_ADAC_NONE || av7110->adac_type == DVB_ADAC_MSP) {