This patch adds KERN_ constants to all of the printk()'s that need them in
drivers/video/savage/savagefb.c

Signed-off-by: James Nelson <james4765@gmail.com>
Signed-off-by: Domen Puncer <domen@coderock.org>
---


 kj-domen/drivers/video/savage/savagefb.c |   35 ++++++++++++++++++-------------
 1 files changed, 21 insertions(+), 14 deletions(-)

diff -puN drivers/video/savage/savagefb.c~printk-drivers_video_savage_savagefb drivers/video/savage/savagefb.c
--- kj/drivers/video/savage/savagefb.c~printk-drivers_video_savage_savagefb	2005-03-02 10:44:38.000000000 +0100
+++ kj-domen/drivers/video/savage/savagefb.c	2005-03-02 10:44:38.000000000 +0100
@@ -41,6 +41,8 @@
  *
  */
 
+#undef DEBUG
+
 #include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
@@ -474,7 +476,7 @@ static int common_calc_clock(long freq, 
 	return 0;
 }
 
-#ifdef SAVAGEFB_DEBUG
+#ifdef DEBUG
 /* This function is used to debug, it prints out the contents of s3 regs */
 
 static void SavagePrintRegs(void)
@@ -483,27 +485,32 @@ static void SavagePrintRegs(void)
 	int vgaCRIndex = 0x3d4;
 	int vgaCRReg = 0x3d5;
 
-	printk(KERN_DEBUG "SR    x0 x1 x2 x3 x4 x5 x6 x7 x8 x9 xA xB xC xD xE "
-	       "xF" );
+	pr_debug("SR    x0 x1 x2 x3 x4 x5 x6 x7 x8 x9 xA xB xC xD xE xF" );
 
 	for( i = 0; i < 0x70; i++ ) {
-		if( !(i % 16) )
-			printk(KERN_DEBUG "\nSR%xx ", i >> 4 );
+		if( !(i % 16) ) {
+			printk("\n");
+			pr_debug("SR%xx ", i >> 4 );
+		}
 		vga_out8( 0x3c4, i );
-		printk(KERN_DEBUG " %02x", vga_in8(0x3c5) );
+		printk(" %02x", vga_in8(0x3c5) );
 	}
+	printk("\n");
 
-	printk(KERN_DEBUG "\n\nCR    x0 x1 x2 x3 x4 x5 x6 x7 x8 x9 xA xB xC "
-	       "xD xE xF" );
+	pr_debug("---BREAK---\n");
+	pr_debug("CR    x0 x1 x2 x3 x4 x5 x6 x7 x8 x9 xA xB xC xD xE xF" );
 
 	for( i = 0; i < 0xB7; i++ ) {
-		if( !(i % 16) )
-			printk(KERN_DEBUG "\nCR%xx ", i >> 4 );
+		if( !(i % 16) ) {
+			printk("\n");
+			pr_debug("CR%xx ", i >> 4 );
+		}
 		vga_out8( vgaCRIndex, i );
-		printk(KERN_DEBUG " %02x", vga_in8(vgaCRReg) );
+		pr_debug(" %02x", vga_in8(vgaCRReg) );
 	}
+	printk("\n");
 
-	printk(KERN_DEBUG "\n\n");
+	pr_debug("---END---\n");
 }
 #endif
 
@@ -1489,7 +1496,7 @@ static int __devinit savage_map_mmio (st
 
 	par->mmio.vbase = ioremap (par->mmio.pbase, par->mmio.len);
 	if (!par->mmio.vbase) {
-		printk ("savagefb: unable to map memory mapped IO\n");
+		printk (KERN_ERR "savagefb: unable to map memory mapped IO\n");
 		return -ENOMEM;
 	} else
 		printk (KERN_INFO "savagefb: mapped io at %p\n",
@@ -1537,7 +1544,7 @@ static int __devinit savage_map_video (s
 	par->video.vbase = ioremap (par->video.pbase, par->video.len);
 
 	if (!par->video.vbase) {
-		printk ("savagefb: unable to map screen memory\n");
+		printk (KERN_ERR "savagefb: unable to map screen memory\n");
 		return -ENOMEM;
 	} else
 		printk (KERN_INFO "savagefb: mapped framebuffer at %p, "
_