From: James Nelson <james4765@cwazy.co.uk>
Subject: drivers/video/: Clean up printk()'s

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

Signed-off-by: James Nelson <james4765@gmail.com>
Signed-off-by: Domen Puncer <domen@coderock.org>
---
 atafb.c                  |    6 -
 aty/mach64_ct.c          |   22 ++----
 aty/radeon_monitor.c     |    6 -
 aty/radeon_pm.c          |    4 -
 bw2.c                    |    2 
 cg3.c                    |    2 
 cg6.c                    |    2 
 cirrusfb.c               |   21 +++---
 clps711xfb.c             |    2 
 console/fbcon.c          |    2 
 console/mdacon.c         |    4 -
 console/newport_con.c    |    4 -
 cyber2000fb.c            |    2 
 dnfb.c                   |    2 
 fbmem.c                  |    2 
 fbmon.c                  |   10 +--
 ffb.c                    |    6 -
 fm2fb.c                  |    2 
 igafb.c                  |   12 +--
 imsttfb.c                |    5 -
 intelfb/intelfbhw.c      |  152 +++++++++++++++++++++++------------------------
 kyro/fbdev.c             |    2 
 leo.c                    |    2 
 macfb.c                  |   14 ++--
 matrox/matroxfb_base.c   |    2 
 modedb.c                 |    2 
 neofb.c                  |   10 +--
 p9100.c                  |    2 
 platinumfb.c             |    6 -
 pm3fb.c                  |    2 
 pmag-ba-fb.c             |    2 
 pmagb-b-fb.c             |    2 
 pvr2fb.c                 |    4 -
 radeonfb.c               |   63 ++++++++-----------
 retz3fb.c                |   84 ++++++++++++-------------
 riva/fbdev.c             |   13 ++--
 savage/savagefb_driver.c |   35 ++++++----
 sstfb.c                  |    2 
 sun3fb.c                 |    6 -
 tcx.c                    |    2 
 tdfxfb.c                 |   12 +--
 virgefb.c                |   46 +++++++-------
 w100fb.c                 |    8 +-
 43 files changed, 296 insertions(+), 295 deletions(-)

Index: quilt/drivers/video/atafb.c
===================================================================
--- quilt.orig/drivers/video/atafb.c
+++ quilt/drivers/video/atafb.c
@@ -2732,7 +2732,7 @@ int __init atafb_init(void)
 		}
 		fbhw = &st_switch;
 		atafb_ops.fb_setcolreg = &stste_setcolreg;
-		printk("Cannot determine video hardware; defaulting to ST(e)\n");
+		pr_info("Cannot determine video hardware; defaulting to ST(e)\n");
 #else /* ATAFB_STE */
 		/* no default driver included */
 		/* Nobody will ever see this message :-) */
@@ -2809,13 +2809,13 @@ int __init atafb_init(void)
 	if (register_framebuffer(&fb_info) < 0)
 		return -EINVAL;
 
-	printk("Determined %dx%d, depth %d\n",
+	pr_info("Determined %dx%d, depth %d\n",
 	       disp.var.xres, disp.var.yres, disp.var.bits_per_pixel);
 	if ((disp.var.xres != disp.var.xres_virtual) ||
 	    (disp.var.yres != disp.var.yres_virtual))
 	   printk("   virtual %dx%d\n",
 			  disp.var.xres_virtual, disp.var.yres_virtual);
-	printk("fb%d: %s frame buffer device, using %dK of video memory\n",
+	pr_info("fb%d: %s frame buffer device, using %dK of video memory\n",
 	       fb_info.node, fb_info.modename, screen_len>>10);
 
 	/* TODO: This driver cannot be unloaded yet */
Index: quilt/drivers/video/aty/mach64_ct.c
===================================================================
--- quilt.orig/drivers/video/aty/mach64_ct.c
+++ quilt/drivers/video/aty/mach64_ct.c
@@ -196,7 +196,7 @@ static int aty_dsp_gt(const struct fb_in
 	pll->dsp_on_off = (dsp_on << 16) + dsp_off;
 	pll->dsp_config = (dsp_precision << 20) | (pll->dsp_loop_latency << 16) | dsp_xclks;
 #ifdef DEBUG
-	printk("atyfb(%s): dsp_config 0x%08x, dsp_on_off 0x%08x\n",
+	pr_debug("atyfb(%s): dsp_config 0x%08x, dsp_on_off 0x%08x\n",
 		__FUNCTION__, pll->dsp_config, pll->dsp_on_off);
 #endif
 	return 0;
@@ -226,7 +226,7 @@ static int aty_valid_pll_ct(const struct
 #ifdef DEBUG
 	pllvclk = (1000000 * 2 * pll->vclk_fb_div) /
 		(par->ref_clk_per * pll->pll_ref_div);
-	printk("atyfb(%s): pllvclk=%d MHz, vclk=%d MHz\n",
+	pr_debug("atyfb(%s): pllvclk=%d MHz, vclk=%d MHz\n",
 		__FUNCTION__, pllvclk, pllvclk / pll->vclk_post_div_real);
 #endif
 	pll->pll_vclk_cntl = 0x03; /* VCLK = PLL_VCLK/VCLKx_POST */
@@ -257,9 +257,7 @@ static u32 aty_pll_to_var_ct(const struc
 		ret /= pll->ct.xres;
 	}
 #endif
-#ifdef DEBUG
-	printk("atyfb(%s): calculated 0x%08X(%i)\n", __FUNCTION__, ret, ret);
-#endif
+	pr_debug("atyfb(%s): calculated 0x%08X(%i)\n", __FUNCTION__, ret, ret);
 	return ret;
 }
 
@@ -270,17 +268,15 @@ void aty_set_pll_ct(const struct fb_info
 	u8 tmp, tmp2;
 
 	lcd_gen_cntrl = 0;
-#ifdef DEBUG
-	printk("atyfb(%s): about to program:\n"
+	pr_debug("atyfb(%s): about to program:\n"
 		"pll_ext_cntl=0x%02x pll_gen_cntl=0x%02x pll_vclk_cntl=0x%02x\n",
 		__FUNCTION__,
 		pll->ct.pll_ext_cntl, pll->ct.pll_gen_cntl, pll->ct.pll_vclk_cntl);
 
-	printk("atyfb(%s): setting clock %lu for FeedBackDivider %i, ReferenceDivider %i, PostDivider %i(%i)\n",
+	pr_debug("atyfb(%s): setting clock %lu for FeedBackDivider %i, ReferenceDivider %i, PostDivider %i(%i)\n",
 		__FUNCTION__,
 		par->clk_wr_offset, pll->ct.vclk_fb_div,
 		pll->ct.pll_ref_div, pll->ct.vclk_post_div, pll->ct.vclk_post_div_real);
-#endif
 #ifdef CONFIG_FB_ATY_GENERIC_LCD
 	if (par->lcd_table != 0) {
 		/* turn off LCD */
@@ -415,10 +411,8 @@ static int __init aty_init_pll_ct(const 
 		pll->ct.xclk_post_div -= 1;
 	}
 
-#ifdef DEBUG
-	printk("atyfb(%s): mclk_fb_mult=%d, xclk_post_div=%d\n",
+	pr_debug("atyfb(%s): mclk_fb_mult=%d, xclk_post_div=%d\n",
 		__FUNCTION__, pll->ct.mclk_fb_mult, pll->ct.xclk_post_div);
-#endif
 
 	memcntl = aty_ld_le32(MEM_CNTL, par);
 	trp = (memcntl & 0x300) >> 8;
@@ -528,7 +522,7 @@ static int __init aty_init_pll_ct(const 
 #ifdef DEBUG
 	pllmclk = (1000000 * pll->ct.mclk_fb_mult * pll->ct.mclk_fb_div) /
 			(par->ref_clk_per * pll->ct.pll_ref_div);
-	printk("atyfb(%s): pllmclk=%d MHz, xclk=%d MHz\n",
+	pr_debug("atyfb(%s): pllmclk=%d MHz, xclk=%d MHz\n",
 		__FUNCTION__, pllmclk, pllmclk / pll->ct.xclk_post_div_real);
 #endif
 
@@ -569,7 +563,7 @@ static int __init aty_init_pll_ct(const 
 #ifdef DEBUG
 		pllsclk = (1000000 * 2 * sclk_fb_div) /
 			(par->ref_clk_per * pll->ct.pll_ref_div);
-		printk("atyfb(%s): use sclk, pllsclk=%d MHz, sclk=mclk=%d MHz\n",
+		pr_debug("atyfb(%s): use sclk, pllsclk=%d MHz, sclk=mclk=%d MHz\n",
 			__FUNCTION__, pllsclk, pllsclk / sclk_post_div_real);
 #endif
 		/*
Index: quilt/drivers/video/aty/radeon_monitor.c
===================================================================
--- quilt.orig/drivers/video/aty/radeon_monitor.c
+++ quilt/drivers/video/aty/radeon_monitor.c
@@ -178,10 +178,10 @@ static int __devinit radeon_get_panel_in
 	for(i=0; i<24; i++)
 		stmp[i] = BIOS_IN8(tmp+i+1);
 	stmp[24] = 0;
-	printk("radeonfb: panel ID string: %s\n", stmp);
+	pr_info("radeonfb: panel ID string: %s\n", stmp);
 	rinfo->panel_info.xres = BIOS_IN16(tmp + 25);
 	rinfo->panel_info.yres = BIOS_IN16(tmp + 27);
-	printk("radeonfb: detected LVDS panel size from BIOS: %dx%d\n",
+	pr_info("radeonfb: detected LVDS panel size from BIOS: %dx%d\n",
 		rinfo->panel_info.xres, rinfo->panel_info.yres);
 
 	rinfo->panel_info.pwr_delay = BIOS_IN16(tmp + 44);
@@ -561,7 +561,7 @@ void __devinit radeon_probe_screens(stru
 		    ((rinfo->bios_seg && (INREG(BIOS_4_SCRATCH) & 4))
 		     || (INREG(LVDS_GEN_CNTL) & LVDS_ON))) {
 			rinfo->mon1_type = MT_LCD;
-			printk("Non-DDC laptop panel detected\n");
+			pr_info("Non-DDC laptop panel detected\n");
 		}
 		if (rinfo->mon1_type == MT_NONE)
 			rinfo->mon1_type = radeon_crt_is_connected(rinfo, rinfo->reversed_DAC);
Index: quilt/drivers/video/aty/radeon_pm.c
===================================================================
--- quilt.orig/drivers/video/aty/radeon_pm.c
+++ quilt/drivers/video/aty/radeon_pm.c
@@ -2722,10 +2722,10 @@ void radeonfb_pm_init(struct radeonfb_in
 	rinfo->dynclk = dynclk;
 	if (dynclk == 1) {
 		radeon_pm_enable_dynamic_mode(rinfo);
-		printk("radeonfb: Dynamic Clock Power Management enabled\n");
+		pr_info("radeonfb: Dynamic Clock Power Management enabled\n");
 	} else if (dynclk == 0) {
 		radeon_pm_disable_dynamic_mode(rinfo);
-		printk("radeonfb: Dynamic Clock Power Management disabled\n");
+		pr_info("radeonfb: Dynamic Clock Power Management disabled\n");
 	}
 
 	/* Check if we can power manage on suspend/resume. We can do
Index: quilt/drivers/video/bw2.c
===================================================================
--- quilt.orig/drivers/video/bw2.c
+++ quilt/drivers/video/bw2.c
@@ -374,7 +374,7 @@ static void bw2_init_one(struct sbus_dev
 
 	list_add(&all->list, &bw2_list);
 
-	printk("bw2: bwtwo at %lx:%lx\n",
+	pr_info("bw2: bwtwo at %lx:%lx\n",
 	       (long) (sdev ? sdev->reg_addrs[0].which_io : 0),
 	       (long) all->par.physbase);
 }
Index: quilt/drivers/video/cg3.c
===================================================================
--- quilt.orig/drivers/video/cg3.c
+++ quilt/drivers/video/cg3.c
@@ -435,7 +435,7 @@ static void cg3_init_one(struct sbus_dev
 
 	list_add(&all->list, &cg3_list);
 
-	printk("cg3: %s at %lx:%lx\n",
+	pr_info("cg3: %s at %lx:%lx\n",
 	       sdev->prom_name,
 	       (long) sdev->reg_addrs[0].which_io,
 	       (long) sdev->reg_addrs[0].phys_addr);
Index: quilt/drivers/video/cg6.c
===================================================================
--- quilt.orig/drivers/video/cg6.c
+++ quilt/drivers/video/cg6.c
@@ -747,7 +747,7 @@ static void cg6_init_one(struct sbus_dev
 
 	list_add(&all->list, &cg6_list);
 
-	printk("cg6: CGsix [%s] at %lx:%lx\n",
+	pr_info("cg6: CGsix [%s] at %lx:%lx\n",
 	       all->info.fix.id,
 	       (long) sdev->reg_addrs[0].which_io,
 	       (long) sdev->reg_addrs[0].phys_addr);
Index: quilt/drivers/video/cirrusfb.c
===================================================================
--- quilt.orig/drivers/video/cirrusfb.c
+++ quilt/drivers/video/cirrusfb.c
@@ -93,7 +93,7 @@
 #ifndef CIRRUSFB_NDEBUG
 #define assert(expr) \
         if(!(expr)) { \
-        printk( "Assertion failed! %s,%s,%s,line=%d\n",\
+        printk(KERN_DEBUG "Assertion failed! %s,%s,%s,line=%d\n",\
         #expr,__FILE__,__FUNCTION__,__LINE__); \
         }
 #else
@@ -703,14 +703,14 @@ static int cirrusfb_check_var(struct fb_
 		den = 1;
 		break;		/* 4 bytes per pixel */
 	default:
-		printk ("cirrusfb: mode %dx%dx%d rejected...color depth not supported.\n",
+		printk (KERN_WARNING "cirrusfb: mode %dx%dx%d rejected...color depth not supported.\n",
 			var->xres, var->yres, var->bits_per_pixel);
 		DPRINTK ("EXIT - EINVAL error\n");
 		return -EINVAL;
 	}
 
 	if (var->xres * nom / den * var->yres > cinfo->size) {
-		printk ("cirrusfb: mode %dx%dx%d rejected...resolution too high to fit into video memory!\n",
+		printk (KERN_WARNING "cirrusfb: mode %dx%dx%d rejected...resolution too high to fit into video memory!\n",
 			var->xres, var->yres, var->bits_per_pixel);
 		DPRINTK ("EXIT - EINVAL error\n");
 		return -EINVAL;
@@ -719,20 +719,20 @@ static int cirrusfb_check_var(struct fb_
 	/* use highest possible virtual resolution */
 	if (var->xres_virtual == -1 &&
 	    var->yres_virtual == -1) {
-		printk ("cirrusfb: using maximum available virtual resolution\n");
+		pr_info ("cirrusfb: using maximum available virtual resolution\n");
 		for (i = 0; modes[i].xres != -1; i++) {
 			if (modes[i].xres * nom / den * modes[i].yres < cinfo->size / 2)
 				break;
 		}
 		if (modes[i].xres == -1) {
-			printk ("cirrusfb: could not find a virtual resolution that fits into video memory!!\n");
+			printk (KERN_WARNING "cirrusfb: could not find a virtual resolution that fits into video memory!!\n");
 			DPRINTK ("EXIT - EINVAL error\n");
 			return -EINVAL;
 		}
 		var->xres_virtual = modes[i].xres;
 		var->yres_virtual = modes[i].yres;
 
-		printk ("cirrusfb: virtual resolution set to maximum of %dx%d\n",
+		pr_info ("cirrusfb: virtual resolution set to maximum of %dx%d\n",
 			var->xres_virtual, var->yres_virtual);
 	}
 
@@ -2169,7 +2169,7 @@ static unsigned int cirrusfb_get_memsize
 		/* 64-bit DRAM data bus width; assume 2MB. Also indicates 2MB memory
 		   * on the 5430. */
 	    case 0x18: mem = 2048 * 1024; break;
-	    default: printk ("CLgenfb: Unknown memory size!\n");
+	    default: printk (KERN_WARNING "CLgenfb: Unknown memory size!\n");
 		mem = 1024 * 1024;
 	}
 	if (SRF & 0x80) {
@@ -2354,7 +2354,7 @@ static void __devexit cirrusfb_cleanup (
 
 	unregister_framebuffer (info);
 	fb_dealloc_cmap (&info->cmap);
-	printk ("Framebuffer unregistered\n");
+	pr_info ("Framebuffer unregistered\n");
 	cinfo->unmap(cinfo);
 
 	DPRINTK ("EXIT\n");
@@ -2439,6 +2439,9 @@ static int cirrusfb_pci_register (struct
 	cinfo->size = board_size;
 	cinfo->unmap = cirrusfb_pci_unmap;
 
+	printk(KERN_INFO "cirrusfb: %s board detected; ",
+	       cirrusfb_board_info[btype].name);
+
 	printk (" RAM (%lu kB) at 0xx%lx, ", cinfo->size / KB_, board_addr);
 	printk ("Cirrus Logic chipset on PCI bus\n");
 	pci_set_drvdata(pdev, info);
@@ -2531,7 +2534,7 @@ static int cirrusfb_zorro_register(struc
 		goto err_release_fb;
 	}
 
-	printk (" RAM (%lu MB) at $%lx, ", board_size / MB_, board_addr);
+	pr_info (" RAM (%lu MB) at $%lx, ", board_size / MB_, board_addr);
 
 	ret = -EIO;
 
Index: quilt/drivers/video/clps711xfb.c
===================================================================
--- quilt.orig/drivers/video/clps711xfb.c
+++ quilt/drivers/video/clps711xfb.c
@@ -385,7 +385,7 @@ int __init clps711xfb_init(void)
 	clps7111fb_backlight_proc_entry = create_proc_entry("backlight", 0444,
 		&proc_root);
 	if (clps7111fb_backlight_proc_entry == NULL) {
-		printk("Couldn't create the /proc entry for the backlight.\n");
+		printk(KERN_ERR "Couldn't create the /proc entry for the backlight.\n");
 		return -EINVAL;
 	}
 
Index: quilt/drivers/video/console/fbcon.c
===================================================================
--- quilt.orig/drivers/video/console/fbcon.c
+++ quilt/drivers/video/console/fbcon.c
@@ -856,7 +856,7 @@ static const char *fbcon_startup(void)
 			udelay(20);
 
 		if (ct == 1000)
-			printk
+			pr_info
 			    ("fbcon_startup: No VBL detected, using timer based cursor.\n");
 
 		free_irq(IRQ_MAC_VBL, fb_vbl_detect);
Index: quilt/drivers/video/console/mdacon.c
===================================================================
--- quilt.orig/drivers/video/console/mdacon.c
+++ quilt/drivers/video/console/mdacon.c
@@ -326,7 +326,7 @@ static const char __init *mdacon_startup
 	mda_type_name = "MDA";
 
 	if (! mda_detect()) {
-		printk("mdacon: MDA card not detected.\n");
+		pr_info("mdacon: MDA card not detected.\n");
 		return NULL;
 	}
 
@@ -337,7 +337,7 @@ static const char __init *mdacon_startup
 	/* cursor looks ugly during boot-up, so turn it off */
 	mda_set_cursor(mda_vram_len - 1);
 
-	printk("mdacon: %s with %ldK of memory detected.\n",
+	pr_info("mdacon: %s with %ldK of memory detected.\n",
 		mda_type_name, mda_vram_len/1024);
 
 	return "MDA-2";
Index: quilt/drivers/video/console/newport_con.c
===================================================================
--- quilt.orig/drivers/video/console/newport_con.c
+++ quilt/drivers/video/console/newport_con.c
@@ -231,7 +231,7 @@ void newport_get_screensize(void)
 			newport_ysize += linetable[i + 1];
 		}
 	}
-	printk("NG1: Screensize %dx%d\n", newport_xsize, newport_ysize);
+	pr_info("NG1: Screensize %dx%d\n", newport_xsize, newport_ysize);
 }
 
 static void newport_get_revisions(void)
@@ -274,7 +274,7 @@ static void newport_get_revisions(void)
 	bt445_rev = (npregs->set.dcbdata0.bybytes.b3 >> 4) - 0x0a;
 
 #define L(a)     (char)('A'+(a))
-	printk
+	pr_info
 	    ("NG1: Revision %d, %d bitplanes, REX3 revision %c, VC2 revision %c, xmap9 revision %c, cmap revision %c, bt445 revision %c\n",
 	     board_rev, bitplanes, L(rex3_rev), L(vc2_rev), L(xmap9_rev),
 	     L(cmap_rev ? (cmap_rev + 1) : 0), L(bt445_rev));
Index: quilt/drivers/video/cyber2000fb.c
===================================================================
--- quilt.orig/drivers/video/cyber2000fb.c
+++ quilt/drivers/video/cyber2000fb.c
@@ -1373,7 +1373,7 @@ static int __devinit cyberpro_common_pro
 	err = -EINVAL;
 	if (!fb_find_mode(&cfb->fb.var, &cfb->fb, NULL, NULL, 0,
 	    		  &cyber2000fb_default_mode, 8)) {
-		printk("%s: no valid mode found\n", cfb->fb.fix.id);
+		printk(KERN_ERR "%s: no valid mode found\n", cfb->fb.fix.id);
 		goto failed;
 	}
 
Index: quilt/drivers/video/dnfb.c
===================================================================
--- quilt.orig/drivers/video/dnfb.c
+++ quilt/drivers/video/dnfb.c
@@ -266,7 +266,7 @@ static int __devinit dnfb_probe(struct d
 	out_8(AP_CONTROL_2, S_DATA_PLN);
 	out_be16(AP_ROP_1, SWAP(0x3));
 
-	printk("apollo frame buffer alive and kicking !\n");
+	pr_info("apollo frame buffer initialized\n");
 	return err;
 }
 
Index: quilt/drivers/video/fbmem.c
===================================================================
--- quilt.orig/drivers/video/fbmem.c
+++ quilt/drivers/video/fbmem.c
@@ -1195,7 +1195,7 @@ fbmem_init(void)
 
 	devfs_mk_dir("fb");
 	if (register_chrdev(FB_MAJOR,"fb",&fb_fops))
-		printk("unable to get major %d for fb devs\n", FB_MAJOR);
+		printk(KERN_WARNING "unable to get major %d for fb devs\n", FB_MAJOR);
 
 	fb_class = class_simple_create(THIS_MODULE, "graphics");
 	if (IS_ERR(fb_class)) {
Index: quilt/drivers/video/fbmon.c
===================================================================
--- quilt.orig/drivers/video/fbmon.c
+++ quilt/drivers/video/fbmon.c
@@ -43,7 +43,7 @@
 #undef DEBUG  /* define this for verbose EDID parsing output */
 
 #ifdef DEBUG
-#define DPRINTK(fmt, args...) printk(fmt,## args)
+#define DPRINTK(fmt, args...) pr_debug("%s(): ", fmt, __FUNCTION__, ## args)
 #else
 #define DPRINTK(fmt, args...)
 #endif
@@ -104,7 +104,7 @@ static int check_edid(unsigned char *edi
 	for (i = 0; i < ARRAY_SIZE(brokendb); i++) {
 		if (!strncmp(manufacturer, brokendb[i].manufacturer, 4) &&
 			brokendb[i].model == model) {
-			printk("fbmon: The EDID Block of "
+			pr_info("fbmon: The EDID Block of "
 			       "Manufacturer: %s Model: 0x%x is known to "
 			       "be broken,\n",  manufacturer, model);
  			fix = brokendb[i].fix;
@@ -137,11 +137,11 @@ static void fix_edid(unsigned char *edid
 
 	switch (fix) {
 	case FBMON_FIX_HEADER:
-		printk("fbmon: trying a header reconstruct\n");
+		pr_info("fbmon: trying a header reconstruct\n");
 		memcpy(edid, edid_v1_header, 8);
 		break;
 	case FBMON_FIX_INPUT:
-		printk("fbmon: trying to fix input type\n");
+		pr_info("fbmon: trying to fix input type\n");
 		b = edid + EDID_STRUCT_DISPLAY;
 		b[0] &= ~0x80;
 		edid[127] += 0x80;
@@ -764,7 +764,7 @@ static void get_monspecs(unsigned char *
 		specs->misc |= FB_MISC_1ST_DETAIL;
 	}
 	if (c & 0x01) {
-		printk("      Display is GTF capable\n");
+		DPRINTK("      Display is GTF capable\n");
 		specs->gtf = 1;
 	}
 }
Index: quilt/drivers/video/ffb.c
===================================================================
--- quilt.orig/drivers/video/ffb.c
+++ quilt/drivers/video/ffb.c
@@ -934,12 +934,12 @@ static void ffb_init_one(int node, int p
 	struct all_info *all;
 
 	if (prom_getproperty(node, "reg", (void *) regs, sizeof(regs)) <= 0) {
-		printk("ffb: Cannot get reg device node property.\n");
+		printk(KERN_ERR "ffb: Cannot get reg device node property.\n");
 		return;
 	}
 
 	if (ffb_apply_upa_parent_ranges(parent, &regs[0])) {
-		printk("ffb: Cannot apply parent ranges to regs.\n");
+		printk(KERN_ERR "ffb: Cannot apply parent ranges to regs.\n");
 		return;
 	}
 
@@ -1026,7 +1026,7 @@ static void ffb_init_one(int node, int p
 
 	list_add(&all->list, &ffb_list);
 
-	printk("ffb: %s at %016lx type %d DAC %d\n",
+	pr_info("ffb: %s at %016lx type %d DAC %d\n",
 	       ((all->par.flags & FFB_FLAG_AFB) ? "AFB" : "FFB"),
 	       regs[0].phys_addr, all->par.board_type, all->par.dac_rev);
 }
Index: quilt/drivers/video/fm2fb.c
===================================================================
--- quilt.orig/drivers/video/fm2fb.c
+++ quilt/drivers/video/fm2fb.c
@@ -288,7 +288,7 @@ static int __devinit fm2fb_probe(struct 
 		zorro_release_device(z);
 		return -EINVAL;
 	}
-	printk("fb%d: %s frame buffer device\n", info->node, fb_fix.id);
+	pr_info("fb%d: %s frame buffer device\n", info->node, fb_fix.id);
 	return 0;
 }
 
Index: quilt/drivers/video/igafb.c
===================================================================
--- quilt.orig/drivers/video/igafb.c
+++ quilt/drivers/video/igafb.c
@@ -364,7 +364,7 @@ static int __init iga_init(struct fb_inf
 	if (register_framebuffer(info) < 0)
 		return 0;
 
-	printk("fb%d: %s frame buffer device at 0x%08lx [%dMB VRAM]\n",
+	pr_info("fb%d: %s frame buffer device at 0x%08lx [%dMB VRAM]\n",
 	       info->node, info->fix.id, 
 	       par->frame_buffer_phys, info->fix.smem_len >> 20);
 
@@ -406,7 +406,7 @@ int __init igafb_init(void)
 
         info = kmalloc(size, GFP_ATOMIC);
         if (!info) {
-                printk("igafb_init: can't alloc fb_info\n");
+                printk(KERN_ERR "igafb_init: can't alloc fb_info\n");
                 return -ENOMEM;
         }
         memset(info, 0, size);
@@ -415,13 +415,13 @@ int __init igafb_init(void)
 	
 
 	if ((addr = pdev->resource[0].start) == 0) {
-                printk("igafb_init: no memory start\n");
+                printk(KERN_ERR "igafb_init: no memory start\n");
 		kfree(info);
 		return -ENXIO;
 	}
 
 	if ((info->screen_base = ioremap(addr, 1024*1024*2)) == 0) {
-                printk("igafb_init: can't remap %lx[2M]\n", addr);
+                printk(KERN_ERR "igafb_init: can't remap %lx[2M]\n", addr);
 		kfree(info);
 		return -ENXIO;
 	}
@@ -454,7 +454,7 @@ int __init igafb_init(void)
 		igafb_fix.mmio_start = 0x30000000;	/* XXX */
 	}
 	if ((par->io_base = (int) ioremap(igafb_fix.mmio_start, igafb_fix.smem_len)) == 0) {
-                printk("igafb_init: can't remap %lx[4K]\n", igafb_fix.mmio_start);
+                printk(KERN_ERR "igafb_init: can't remap %lx[4K]\n", igafb_fix.mmio_start);
 		iounmap((void *)info->screen_base);
 		kfree(info);
 		return -ENXIO;
@@ -470,7 +470,7 @@ int __init igafb_init(void)
 
 	par->mmap_map = kmalloc(4 * sizeof(*par->mmap_map), GFP_ATOMIC);
 	if (!par->mmap_map) {
-		printk("igafb_init: can't alloc mmap_map\n");
+		printk(KERN_ERR "igafb_init: can't alloc mmap_map\n");
 		iounmap((void *)par->io_base);
 		iounmap(info->screen_base);
 		kfree(info);
Index: quilt/drivers/video/imsttfb.c
===================================================================
--- quilt.orig/drivers/video/imsttfb.c
+++ quilt/drivers/video/imsttfb.c
@@ -1413,7 +1413,8 @@ init_imstt(struct fb_info *info)
 
 	if ((info->var.xres * info->var.yres) * (info->var.bits_per_pixel >> 3) > info->fix.smem_len
 	    || !(compute_imstt_regvals(par, info->var.xres, info->var.yres))) {
-		printk("imsttfb: %ux%ux%u not supported\n", info->var.xres, info->var.yres, info->var.bits_per_pixel);
+		printk(KERN_ERR "imsttfb: %ux%ux%u not supported\n",
+			info->var.xres, info->var.yres, info->var.bits_per_pixel);
 		kfree(info);
 		return;
 	}
@@ -1455,7 +1456,7 @@ init_imstt(struct fb_info *info)
 	}
 
 	tmp = (read_reg_le32(par->dc_regs, SSTATUS) & 0x0f00) >> 8;
-	printk("fb%u: %s frame buffer; %uMB vram; chip version %u\n",
+	pr_info("fb%u: %s frame buffer; %uMB vram; chip version %u\n",
 		info->node, info->fix.id, info->fix.smem_len >> 20, tmp);
 }
 
Index: quilt/drivers/video/intelfb/intelfbhw.c
===================================================================
--- quilt.orig/drivers/video/intelfb/intelfbhw.c
+++ quilt/drivers/video/intelfb/intelfbhw.c
@@ -540,10 +540,10 @@ intelfbhw_print_hw_state(struct intelfb_
 	if (!hw || !dinfo)
 		return;
 	/* Read in as much of the HW state as possible. */
-	printk("hw state dump start\n");
-	printk("	VGA0_DIVISOR:		0x%08x\n", hw->vga0_divisor);
-	printk("	VGA1_DIVISOR:		0x%08x\n", hw->vga1_divisor);
-	printk("	VGAPD: 			0x%08x\n", hw->vga_pd);
+	pr_info("hw state dump start\n");
+	pr_info("	VGA0_DIVISOR:		0x%08x\n", hw->vga0_divisor);
+	pr_info("	VGA1_DIVISOR:		0x%08x\n", hw->vga1_divisor);
+	pr_info("	VGAPD: 			0x%08x\n", hw->vga_pd);
 	n = (hw->vga0_divisor >> FP_N_DIVISOR_SHIFT) & FP_DIVISOR_MASK;
 	m1 = (hw->vga0_divisor >> FP_M1_DIVISOR_SHIFT) & FP_DIVISOR_MASK;
 	m2 = (hw->vga0_divisor >> FP_M2_DIVISOR_SHIFT) & FP_DIVISOR_MASK;
@@ -552,9 +552,9 @@ intelfbhw_print_hw_state(struct intelfb_
 	else
 		p1 = (hw->vga_pd >> VGAPD_0_P1_SHIFT) & DPLL_P1_MASK;
 	p2 = (hw->vga_pd >> VGAPD_0_P2_SHIFT) & DPLL_P2_MASK;
-	printk("	VGA0: (m1, m2, n, p1, p2) = (%d, %d, %d, %d, %d)\n",
+	pr_info("	VGA0: (m1, m2, n, p1, p2) = (%d, %d, %d, %d, %d)\n",
 		m1, m2, n, p1, p2);
-	printk("	VGA0: clock is %d\n", CALC_VCLOCK(m1, m2, n, p1, p2));
+	pr_info("	VGA0: clock is %d\n", CALC_VCLOCK(m1, m2, n, p1, p2));
 
 	n = (hw->vga1_divisor >> FP_N_DIVISOR_SHIFT) & FP_DIVISOR_MASK;
 	m1 = (hw->vga1_divisor >> FP_M1_DIVISOR_SHIFT) & FP_DIVISOR_MASK;
@@ -564,16 +564,16 @@ intelfbhw_print_hw_state(struct intelfb_
 	else
 		p1 = (hw->vga_pd >> VGAPD_1_P1_SHIFT) & DPLL_P1_MASK;
 	p2 = (hw->vga_pd >> VGAPD_1_P2_SHIFT) & DPLL_P2_MASK;
-	printk("	VGA1: (m1, m2, n, p1, p2) = (%d, %d, %d, %d, %d)\n",
+	pr_info("	VGA1: (m1, m2, n, p1, p2) = (%d, %d, %d, %d, %d)\n",
 		m1, m2, n, p1, p2);
-	printk("	VGA1: clock is %d\n", CALC_VCLOCK(m1, m2, n, p1, p2));
+	pr_info("	VGA1: clock is %d\n", CALC_VCLOCK(m1, m2, n, p1, p2));
 
-	printk("	DPLL_A:			0x%08x\n", hw->dpll_a);
-	printk("	DPLL_B:			0x%08x\n", hw->dpll_b);
-	printk("	FPA0:			0x%08x\n", hw->fpa0);
-	printk("	FPA1:			0x%08x\n", hw->fpa1);
-	printk("	FPB0:			0x%08x\n", hw->fpb0);
-	printk("	FPB1:			0x%08x\n", hw->fpb1);
+	pr_info("	DPLL_A:			0x%08x\n", hw->dpll_a);
+	pr_info("	DPLL_B:			0x%08x\n", hw->dpll_b);
+	pr_info("	FPA0:			0x%08x\n", hw->fpa0);
+	pr_info("	FPA1:			0x%08x\n", hw->fpa1);
+	pr_info("	FPB0:			0x%08x\n", hw->fpb0);
+	pr_info("	FPB1:			0x%08x\n", hw->fpb1);
 
 	n = (hw->fpa0 >> FP_N_DIVISOR_SHIFT) & FP_DIVISOR_MASK;
 	m1 = (hw->fpa0 >> FP_M1_DIVISOR_SHIFT) & FP_DIVISOR_MASK;
@@ -583,9 +583,9 @@ intelfbhw_print_hw_state(struct intelfb_
 	else
 		p1 = (hw->dpll_a >> DPLL_P1_SHIFT) & DPLL_P1_MASK;
 	p2 = (hw->dpll_a >> DPLL_P2_SHIFT) & DPLL_P2_MASK;
-	printk("	PLLA0: (m1, m2, n, p1, p2) = (%d, %d, %d, %d, %d)\n",
+	pr_info("	PLLA0: (m1, m2, n, p1, p2) = (%d, %d, %d, %d, %d)\n",
 		m1, m2, n, p1, p2);
-	printk("	PLLA0: clock is %d\n", CALC_VCLOCK(m1, m2, n, p1, p2));
+	pr_info("	PLLA0: clock is %d\n", CALC_VCLOCK(m1, m2, n, p1, p2));
 
 	n = (hw->fpa1 >> FP_N_DIVISOR_SHIFT) & FP_DIVISOR_MASK;
 	m1 = (hw->fpa1 >> FP_M1_DIVISOR_SHIFT) & FP_DIVISOR_MASK;
@@ -595,62 +595,62 @@ intelfbhw_print_hw_state(struct intelfb_
 	else
 		p1 = (hw->dpll_a >> DPLL_P1_SHIFT) & DPLL_P1_MASK;
 	p2 = (hw->dpll_a >> DPLL_P2_SHIFT) & DPLL_P2_MASK;
-	printk("	PLLA1: (m1, m2, n, p1, p2) = (%d, %d, %d, %d, %d)\n",
+	pr_info("	PLLA1: (m1, m2, n, p1, p2) = (%d, %d, %d, %d, %d)\n",
 		m1, m2, n, p1, p2);
-	printk("	PLLA1: clock is %d\n", CALC_VCLOCK(m1, m2, n, p1, p2));
+	pr_info("	PLLA1: clock is %d\n", CALC_VCLOCK(m1, m2, n, p1, p2));
 
 #if 0
-	printk("	PALETTE_A:\n");
+	pr_info("	PALETTE_A:\n");
 	for (i = 0; i < PALETTE_8_ENTRIES)
-		printk("	%3d:	0x%08x\n", i, hw->palette_a[i];
-	printk("	PALETTE_B:\n");
+		pr_info("	%3d:	0x%08x\n", i, hw->palette_a[i];
+	pr_info("	PALETTE_B:\n");
 	for (i = 0; i < PALETTE_8_ENTRIES)
-		printk("	%3d:	0x%08x\n", i, hw->palette_b[i];
+		pr_info("	%3d:	0x%08x\n", i, hw->palette_b[i];
 #endif
 
-	printk("	HTOTAL_A:		0x%08x\n", hw->htotal_a);
-	printk("	HBLANK_A:		0x%08x\n", hw->hblank_a);
-	printk("	HSYNC_A:		0x%08x\n", hw->hsync_a);
-	printk("	VTOTAL_A:		0x%08x\n", hw->vtotal_a);
-	printk("	VBLANK_A:		0x%08x\n", hw->vblank_a);
-	printk("	VSYNC_A:		0x%08x\n", hw->vsync_a);
-	printk("	SRC_SIZE_A:		0x%08x\n", hw->src_size_a);
-	printk("	BCLRPAT_A:		0x%08x\n", hw->bclrpat_a);
-	printk("	HTOTAL_B:		0x%08x\n", hw->htotal_b);
-	printk("	HBLANK_B:		0x%08x\n", hw->hblank_b);
-	printk("	HSYNC_B:		0x%08x\n", hw->hsync_b);
-	printk("	VTOTAL_B:		0x%08x\n", hw->vtotal_b);
-	printk("	VBLANK_B:		0x%08x\n", hw->vblank_b);
-	printk("	VSYNC_B:		0x%08x\n", hw->vsync_b);
-	printk("	SRC_SIZE_B:		0x%08x\n", hw->src_size_b);
-	printk("	BCLRPAT_B:		0x%08x\n", hw->bclrpat_b);
-
-	printk("	ADPA:			0x%08x\n", hw->adpa);
-	printk("	DVOA:			0x%08x\n", hw->dvoa);
-	printk("	DVOB:			0x%08x\n", hw->dvob);
-	printk("	DVOC:			0x%08x\n", hw->dvoc);
-	printk("	DVOA_SRCDIM:		0x%08x\n", hw->dvoa_srcdim);
-	printk("	DVOB_SRCDIM:		0x%08x\n", hw->dvob_srcdim);
-	printk("	DVOC_SRCDIM:		0x%08x\n", hw->dvoc_srcdim);
-	printk("	LVDS:			0x%08x\n", hw->lvds);
-
-	printk("	PIPEACONF:		0x%08x\n", hw->pipe_a_conf);
-	printk("	PIPEBCONF:		0x%08x\n", hw->pipe_b_conf);
-	printk("	DISPARB:		0x%08x\n", hw->disp_arb);
-
-	printk("	CURSOR_A_CONTROL:	0x%08x\n", hw->cursor_a_control);
-	printk("	CURSOR_B_CONTROL:	0x%08x\n", hw->cursor_b_control);
-	printk("	CURSOR_A_BASEADDR:	0x%08x\n", hw->cursor_a_base);
-	printk("	CURSOR_B_BASEADDR:	0x%08x\n", hw->cursor_b_base);
+	pr_info("	HTOTAL_A:		0x%08x\n", hw->htotal_a);
+	pr_info("	HBLANK_A:		0x%08x\n", hw->hblank_a);
+	pr_info("	HSYNC_A:		0x%08x\n", hw->hsync_a);
+	pr_info("	VTOTAL_A:		0x%08x\n", hw->vtotal_a);
+	pr_info("	VBLANK_A:		0x%08x\n", hw->vblank_a);
+	pr_info("	VSYNC_A:		0x%08x\n", hw->vsync_a);
+	pr_info("	SRC_SIZE_A:		0x%08x\n", hw->src_size_a);
+	pr_info("	BCLRPAT_A:		0x%08x\n", hw->bclrpat_a);
+	pr_info("	HTOTAL_B:		0x%08x\n", hw->htotal_b);
+	pr_info("	HBLANK_B:		0x%08x\n", hw->hblank_b);
+	pr_info("	HSYNC_B:		0x%08x\n", hw->hsync_b);
+	pr_info("	VTOTAL_B:		0x%08x\n", hw->vtotal_b);
+	pr_info("	VBLANK_B:		0x%08x\n", hw->vblank_b);
+	pr_info("	VSYNC_B:		0x%08x\n", hw->vsync_b);
+	pr_info("	SRC_SIZE_B:		0x%08x\n", hw->src_size_b);
+	pr_info("	BCLRPAT_B:		0x%08x\n", hw->bclrpat_b);
+
+	pr_info("	ADPA:			0x%08x\n", hw->adpa);
+	pr_info("	DVOA:			0x%08x\n", hw->dvoa);
+	pr_info("	DVOB:			0x%08x\n", hw->dvob);
+	pr_info("	DVOC:			0x%08x\n", hw->dvoc);
+	pr_info("	DVOA_SRCDIM:		0x%08x\n", hw->dvoa_srcdim);
+	pr_info("	DVOB_SRCDIM:		0x%08x\n", hw->dvob_srcdim);
+	pr_info("	DVOC_SRCDIM:		0x%08x\n", hw->dvoc_srcdim);
+	pr_info("	LVDS:			0x%08x\n", hw->lvds);
+
+	pr_info("	PIPEACONF:		0x%08x\n", hw->pipe_a_conf);
+	pr_info("	PIPEBCONF:		0x%08x\n", hw->pipe_b_conf);
+	pr_info("	DISPARB:		0x%08x\n", hw->disp_arb);
+
+	pr_info("	CURSOR_A_CONTROL:	0x%08x\n", hw->cursor_a_control);
+	pr_info("	CURSOR_B_CONTROL:	0x%08x\n", hw->cursor_b_control);
+	pr_info("	CURSOR_A_BASEADDR:	0x%08x\n", hw->cursor_a_base);
+	pr_info("	CURSOR_B_BASEADDR:	0x%08x\n", hw->cursor_b_base);
 
-	printk("	CURSOR_A_PALETTE:	");
+	pr_info("	CURSOR_A_PALETTE:	");
 	for (i = 0; i < 4; i++) {
 		printk("0x%08x", hw->cursor_a_palette[i]);
 		if (i < 3)
 			printk(", ");
 	}
 	printk("\n");
-	printk("	CURSOR_B_PALETTE:	");
+	pr_info("	CURSOR_B_PALETTE:	");
 	for (i = 0; i < 4; i++) {
 		printk("0x%08x", hw->cursor_b_palette[i]);
 		if (i < 3)
@@ -658,40 +658,40 @@ intelfbhw_print_hw_state(struct intelfb_
 	}
 	printk("\n");
 
-	printk("	CURSOR_SIZE:		0x%08x\n", hw->cursor_size);
+	pr_info("	CURSOR_SIZE:		0x%08x\n", hw->cursor_size);
 
-	printk("	DSPACNTR:		0x%08x\n", hw->disp_a_ctrl);
-	printk("	DSPBCNTR:		0x%08x\n", hw->disp_b_ctrl);
-	printk("	DSPABASE:		0x%08x\n", hw->disp_a_base);
-	printk("	DSPBBASE:		0x%08x\n", hw->disp_b_base);
-	printk("	DSPASTRIDE:		0x%08x\n", hw->disp_a_stride);
-	printk("	DSPBSTRIDE:		0x%08x\n", hw->disp_b_stride);
+	pr_info("	DSPACNTR:		0x%08x\n", hw->disp_a_ctrl);
+	pr_info("	DSPBCNTR:		0x%08x\n", hw->disp_b_ctrl);
+	pr_info("	DSPABASE:		0x%08x\n", hw->disp_a_base);
+	pr_info("	DSPBBASE:		0x%08x\n", hw->disp_b_base);
+	pr_info("	DSPASTRIDE:		0x%08x\n", hw->disp_a_stride);
+	pr_info("	DSPBSTRIDE:		0x%08x\n", hw->disp_b_stride);
 
-	printk("	VGACNTRL:		0x%08x\n", hw->vgacntrl);
-	printk("	ADD_ID:			0x%08x\n", hw->add_id);
+	pr_info("	VGACNTRL:		0x%08x\n", hw->vgacntrl);
+	pr_info("	ADD_ID:			0x%08x\n", hw->add_id);
 
 	for (i = 0; i < 7; i++) {
-		printk("	SWF0%d			0x%08x\n", i,
+		pr_info("	SWF0%d			0x%08x\n", i,
 			hw->swf0x[i]);
 	}
 	for (i = 0; i < 7; i++) {
-		printk("	SWF1%d			0x%08x\n", i,
+		pr_info("	SWF1%d			0x%08x\n", i,
 			hw->swf1x[i]);
 	}
 	for (i = 0; i < 3; i++) {
-		printk("	SWF3%d			0x%08x\n", i,
+		pr_info("	SWF3%d			0x%08x\n", i,
 			hw->swf3x[i]);
 	}
 	for (i = 0; i < 8; i++)
-		printk("	FENCE%d			0x%08x\n", i,
+		pr_info("	FENCE%d			0x%08x\n", i,
 			hw->fence[i]);
 
-	printk("	INSTPM			0x%08x\n", hw->instpm);
-	printk("	MEM_MODE		0x%08x\n", hw->mem_mode);
-	printk("	FW_BLC_0		0x%08x\n", hw->fw_blc_0);
-	printk("	FW_BLC_1		0x%08x\n", hw->fw_blc_1);
+	pr_info("	INSTPM			0x%08x\n", hw->instpm);
+	pr_info("	MEM_MODE		0x%08x\n", hw->mem_mode);
+	pr_info("	FW_BLC_0		0x%08x\n", hw->fw_blc_0);
+	pr_info("	FW_BLC_1		0x%08x\n", hw->fw_blc_1);
 
-	printk("hw state dump end\n");
+	pr_info("hw state dump end\n");
 #endif
 }
 
Index: quilt/drivers/video/kyro/fbdev.c
===================================================================
--- quilt.orig/drivers/video/kyro/fbdev.c
+++ quilt/drivers/video/kyro/fbdev.c
@@ -746,7 +746,7 @@ static int __devinit kyrofb_probe(struct
 	if (register_framebuffer(info) < 0)
 		goto out_unmap;
 
-	printk("fb%d: %s frame buffer device, at %dx%d@%d using %ldk/%ldk of VRAM\n",
+	pr_info("fb%d: %s frame buffer device, at %dx%d@%d using %ldk/%ldk of VRAM\n",
 	       info->node, info->fix.id, info->var.xres,
 	       info->var.yres, info->var.bits_per_pixel, size >> 10,
 	       (unsigned long)info->fix.smem_len >> 10);
Index: quilt/drivers/video/leo.c
===================================================================
--- quilt.orig/drivers/video/leo.c
+++ quilt/drivers/video/leo.c
@@ -614,7 +614,7 @@ static void leo_init_one(struct sbus_dev
 
 	list_add(&all->list, &leo_list);
 
-	printk("leo: %s at %lx:%lx\n",
+	pr_info("leo: %s at %lx:%lx\n",
 	       sdev->prom_name,
 	       (long) sdev->reg_addrs[0].which_io,
 	       (long) sdev->reg_addrs[0].phys_addr);
Index: quilt/drivers/video/macfb.c
===================================================================
--- quilt.orig/drivers/video/macfb.c
+++ quilt/drivers/video/macfb.c
@@ -639,9 +639,9 @@ void __init macfb_init(void)
 	   Mac */
 	fb_info.screen_base = ioremap(mac_bi_data.videoaddr, macfb_fix.smem_len);
 	
-	printk("macfb: framebuffer at 0x%08lx, mapped to 0x%p, size %dk\n",
+	pr_info("macfb: framebuffer at 0x%08lx, mapped to 0x%p, size %dk\n",
 	       macfb_fix.smem_start, fb_info.screen_base, macfb_fix.smem_len/1024);
-	printk("macfb: mode is %dx%dx%d, linelength=%d\n",
+	pr_info("macfb: mode is %dx%dx%d, linelength=%d\n",
 	       macfb_defined.xres, macfb_defined.yres, macfb_defined.bits_per_pixel, macfb_fix.line_length);
 	
 	/*
@@ -653,7 +653,7 @@ void __init macfb_init(void)
 	macfb_defined.height = PIXEL_TO_MM(macfb_defined.yres);
 	macfb_defined.width  = PIXEL_TO_MM(macfb_defined.xres);	 
 
-	printk("macfb: scrolling: redraw\n");
+	pr_info("macfb: scrolling: redraw\n");
 	macfb_defined.yres_virtual = macfb_defined.yres;
 
 	/* some dummy values for timing to make fbset happy */
@@ -689,7 +689,7 @@ void __init macfb_init(void)
 		macfb_defined.green.length = 5;
 		macfb_defined.blue.offset = 0;
 		macfb_defined.blue.length = 5;
-		printk("macfb: directcolor: "
+		pr_info("macfb: directcolor: "
 		       "size=1:5:5:5, shift=15:10:5:0\n");
 		video_cmap_len = 16;
 		/* Should actually be FB_VISUAL_DIRECTCOLOR, but this
@@ -706,14 +706,14 @@ void __init macfb_init(void)
 		macfb_defined.green.length = 8;
 		macfb_defined.blue.offset = 0;
 		macfb_defined.blue.length = 8;
-		printk("macfb: truecolor: "
+		pr_info("macfb: truecolor: "
 		       "size=0:8:8:8, shift=0:16:8:0\n");
 		video_cmap_len = 16;
 		macfb_fix.visual = FB_VISUAL_TRUECOLOR;
 	default:
 		video_cmap_len = 0;
 		macfb_fix.visual = FB_VISUAL_MONO01;
-		printk("macfb: unknown or unsupported bit depth: %d\n", macfb_defined.bits_per_pixel);
+		printk(KERN_WARNING "macfb: unknown or unsupported bit depth: %d\n", macfb_defined.bits_per_pixel);
 		break;
 	}
 	
@@ -962,7 +962,7 @@ void __init macfb_init(void)
 	if (register_framebuffer(&fb_info) < 0)
 		return;
 
-	printk("fb%d: %s frame buffer device\n",
+	pr_info("fb%d: %s frame buffer device\n",
 	       fb_info.node, fb_info.fix.id);
 }
 
Index: quilt/drivers/video/matrox/matroxfb_base.c
===================================================================
--- quilt.orig/drivers/video/matrox/matroxfb_base.c
+++ quilt/drivers/video/matrox/matroxfb_base.c
@@ -1880,7 +1880,7 @@ static int initMatrox2(WPMINFO struct bo
 	if (register_framebuffer(&ACCESS_FBINFO(fbcon)) < 0) {
 		goto failVideoIO;
 	}
-	printk("fb%d: %s frame buffer device\n",
+	pr_info("fb%d: %s frame buffer device\n",
 	       ACCESS_FBINFO(fbcon.node), ACCESS_FBINFO(fbcon.fix.id));
 
 	/* there is no console on this fb... but we have to initialize hardware
Index: quilt/drivers/video/modedb.c
===================================================================
--- quilt.orig/drivers/video/modedb.c
+++ quilt/drivers/video/modedb.c
@@ -24,7 +24,7 @@
     ((v).xres == (x) && (v).yres == (y))
 
 #ifdef DEBUG
-#define DPRINTK(fmt, args...)	printk("modedb %s: " fmt, __FUNCTION__ , ## args)
+#define DPRINTK(fmt, args...)	pr_debug("modedb %s: " fmt, __FUNCTION__ , ## args)
 #else
 #define DPRINTK(fmt, args...)
 #endif
Index: quilt/drivers/video/neofb.c
===================================================================
--- quilt.orig/drivers/video/neofb.c
+++ quilt/drivers/video/neofb.c
@@ -252,7 +252,7 @@ static void neoCalcVCLK(const struct fb_
 	par->VCLK3Denominator = d_best;
 
 #ifdef NEOFB_DEBUG
-	printk("neoVCLK: f:%d NumLow=%d NumHi=%d Den=%d Df=%d\n",
+	printk(KERN_DEBUG "neoVCLK: f:%d NumLow=%d NumHi=%d Den=%d Df=%d\n",
 	       f_target >> 12,
 	       par->VCLK3NumeratorLow,
 	       par->VCLK3NumeratorHigh,
@@ -1716,13 +1716,13 @@ static int __devinit neo_map_mmio(struct
 
 	if (!request_mem_region
 	    (info->fix.mmio_start, MMIO_SIZE, "memory mapped I/O")) {
-		printk("neofb: memory mapped IO in use\n");
+		printk(KERN_ERR "neofb: memory mapped IO in use\n");
 		return -EBUSY;
 	}
 
 	par->mmio_vbase = ioremap(info->fix.mmio_start, MMIO_SIZE);
 	if (!par->mmio_vbase) {
-		printk("neofb: unable to map memory mapped IO\n");
+		printk(KERN_ERR "neofb: unable to map memory mapped IO\n");
 		release_mem_region(info->fix.mmio_start,
 				   info->fix.mmio_len);
 		return -ENOMEM;
@@ -1757,14 +1757,14 @@ static int __devinit neo_map_video(struc
 
 	if (!request_mem_region(info->fix.smem_start, info->fix.smem_len,
 				"frame buffer")) {
-		printk("neofb: frame buffer in use\n");
+		printk(KERN_WARNING "neofb: frame buffer in use\n");
 		return -EBUSY;
 	}
 
 	info->screen_base =
 	    ioremap(info->fix.smem_start, info->fix.smem_len);
 	if (!info->screen_base) {
-		printk("neofb: unable to map screen memory\n");
+		printk(KERN_ERR "neofb: unable to map screen memory\n");
 		release_mem_region(info->fix.smem_start,
 				   info->fix.smem_len);
 		return -ENOMEM;
Index: quilt/drivers/video/p9100.c
===================================================================
--- quilt.orig/drivers/video/p9100.c
+++ quilt/drivers/video/p9100.c
@@ -326,7 +326,7 @@ static void p9100_init_one(struct sbus_d
 
 	list_add(&all->list, &p9100_list);
 
-	printk("p9100: %s at %lx:%lx\n",
+	pr_info("p9100: %s at %lx:%lx\n",
 	       sdev->prom_name,
 	       (long) sdev->reg_addrs[0].which_io,
 	       (long) sdev->reg_addrs[0].phys_addr);
Index: quilt/drivers/video/platinumfb.c
===================================================================
--- quilt.orig/drivers/video/platinumfb.c
+++ quilt/drivers/video/platinumfb.c
@@ -146,7 +146,7 @@ static int platinumfb_set_par (struct fb
 	info->fix.visual = (pinfo->cmode == CMODE_8) ?
 		FB_VISUAL_PSEUDOCOLOR : FB_VISUAL_DIRECTCOLOR;
 	info->fix.line_length = vmode_attrs[pinfo->vmode-1].hres * (1<<pinfo->cmode) + offset;
-	printk("line_length: %x\n", info->fix.line_length);
+	printk(KERN_DEBUG "line_length: %x\n", info->fix.line_length);
 	return 0;
 }
 
@@ -362,12 +362,12 @@ static int __devinit platinum_init_fb(st
 	      platinum_vram_reqd(default_vmode, default_cmode) > pinfo->total_vram)
 		default_cmode--;
 
-	printk("platinumfb:  Using video mode %d and color mode %d.\n", default_vmode, default_cmode);
+	pr_info("platinumfb:  Using video mode %d and color mode %d.\n", default_vmode, default_cmode);
 
 	/* Setup default var */
 	if (mac_vmode_to_var(default_vmode, default_cmode, &var) < 0) {
 		/* This shouldn't happen! */
-		printk("mac_vmode_to_var(%d, %d,) failed\n", default_vmode, default_cmode);
+		printk(KERN_ERR "mac_vmode_to_var(%d, %d,) failed\n", default_vmode, default_cmode);
 try_again:
 		default_vmode = VMODE_640_480_60;
 		default_cmode = CMODE_8;
Index: quilt/drivers/video/pm3fb.c
===================================================================
--- quilt.orig/drivers/video/pm3fb.c
+++ quilt/drivers/video/pm3fb.c
@@ -1576,7 +1576,7 @@ static void pm3fb_common_init(struct pm3
 	
 	pm3fb_write_mode(l_fb_info);
 	
-	printk("fb%d: %s, using %uK of video memory (%s)\n",
+	pr_info("fb%d: %s, using %uK of video memory (%s)\n",
 	       l_fb_info->gen.info.node,
 	       permedia3_name, (u32) (l_fb_info->fb_size >> 10),
 	       cardbase[l_fb_info->board_type].cardname);
Index: quilt/drivers/video/pmag-ba-fb.c
===================================================================
--- quilt.orig/drivers/video/pmag-ba-fb.c
+++ quilt/drivers/video/pmag-ba-fb.c
@@ -126,7 +126,7 @@ int __init pmagbafb_init_one(int slot)
 	struct fb_info *info = &pmagba_fb_info[slot]; 
 	struct display *disp = &pmagba_disp[slot];
 
-	printk("PMAG-BA framebuffer in slot %d\n", slot);
+	pr_info("PMAG-BA framebuffer in slot %d\n", slot);
 	/*
 	 * Framebuffer display memory base address and friends
 	 */
Index: quilt/drivers/video/pmagb-b-fb.c
===================================================================
--- quilt.orig/drivers/video/pmagb-b-fb.c
+++ quilt/drivers/video/pmagb-b-fb.c
@@ -126,7 +126,7 @@ int __init pmagbbfb_init_one(int slot)
 	unsigned long base_addr = get_tc_base_addr(slot);
 	struct fb_info *info = &pmagbb_fb_info[slot];
 
-	printk("PMAGB-BA framebuffer in slot %d\n", slot);
+	pr_info("PMAGB-BA framebuffer in slot %d\n", slot);
 	/*
 	 * Framebuffer display memory base address and friends
 	 */
Index: quilt/drivers/video/pvr2fb.c
===================================================================
--- quilt.orig/drivers/video/pvr2fb.c
+++ quilt/drivers/video/pvr2fb.c
@@ -818,10 +818,10 @@ static int __init pvr2fb_common_init(voi
 
 	rev = fb_readl(par->mmio_base + 0x04);
 
-	printk("fb%d: %s (rev %ld.%ld) frame buffer device, using %ldk/%ldk of video memory\n",
+	pr_info("fb%d: %s (rev %ld.%ld) frame buffer device, using %ldk/%ldk of video memory\n",
 	       fb_info->node, fb_info->fix.id, (rev >> 4) & 0x0f, rev & 0x0f,
 	       modememused >> 10, (unsigned long)(fb_info->fix.smem_len >> 10));
-	printk("fb%d: Mode %dx%d-%d pitch = %ld cable: %s video output: %s\n", 
+	pr_info("fb%d: Mode %dx%d-%d pitch = %ld cable: %s video output: %s\n",
 	       fb_info->node, fb_info->var.xres, fb_info->var.yres,
 	       fb_info->var.bits_per_pixel, 
 	       get_line_length(fb_info->var.xres, fb_info->var.bits_per_pixel),
Index: quilt/drivers/video/radeonfb.c
===================================================================
--- quilt.orig/drivers/video/radeonfb.c
+++ quilt/drivers/video/radeonfb.c
@@ -28,6 +28,7 @@
  *
  */
 
+#define DEBUG
 
 #define RADEON_VERSION	"0.1.6"
 
@@ -80,13 +81,7 @@
 #include <video/radeon.h>
 #include <linux/radeonfb.h>
 
-#define DEBUG	1
-
-#if DEBUG
-#define RTRACE		printk
-#else
-#define RTRACE		if(0) printk
-#endif
+#define RTRACE		pr_debug
 
 // XXX
 #undef CONFIG_PMAC_PBOOK
@@ -810,7 +805,7 @@ static void radeon_get_pllinfo(struct ra
         	rinfo->pll.ppll_min = pll.PCLK_min_freq;
         	rinfo->pll.ppll_max = pll.PCLK_max_freq;
 
-		printk("radeonfb: ref_clk=%d, ref_div=%d, xclk=%d from BIOS\n",
+		pr_info("radeonfb: ref_clk=%d, ref_div=%d, xclk=%d from BIOS\n",
 			rinfo->pll.ref_clk, rinfo->pll.ref_div, rinfo->pll.xclk);
 	} else {
 #ifdef CONFIG_PPC_OF
@@ -830,7 +825,7 @@ static void radeon_get_pllinfo(struct ra
 			rinfo->pll.ppll_min = 12000;
 			rinfo->pll.ppll_max = 35000;
 
-			printk("radeonfb: ref_clk=%d, ref_div=%d, xclk=%d from OF\n",
+			pr_info("radeonfb: ref_clk=%d, ref_div=%d, xclk=%d from OF\n",
 				rinfo->pll.ref_clk, rinfo->pll.ref_div, rinfo->pll.xclk);
 
 			return;
@@ -890,7 +885,7 @@ static void radeon_get_pllinfo(struct ra
 				break;
 		}
 
-		printk("radeonfb: ref_clk=%d, ref_div=%d, xclk=%d defaults\n",
+		pr_info("radeonfb: ref_clk=%d, ref_div=%d, xclk=%d defaults\n",
 			rinfo->pll.ref_clk, rinfo->pll.ref_div, rinfo->pll.xclk);
 	}
 }
@@ -1012,7 +1007,7 @@ static int radeon_dfp_parse_EDID(struct 
 			rinfo->vAct_high = 1;
 	}
 
-	printk("radeonfb: detected DFP panel size from EDID: %dx%d\n",
+	pr_info("radeonfb: detected DFP panel size from EDID: %dx%d\n",
 		rinfo->panel_xres, rinfo->panel_yres);
 
 	rinfo->got_dfpinfo = 1;
@@ -1064,22 +1059,22 @@ static int radeon_get_dfpinfo_BIOS(struc
 		return 0;
 
 	if (!(fpbiosstart = rinfo->bios_seg + readw(rinfo->bios_seg + 0x48))) {
-		printk("radeonfb: Failed to detect DFP panel info using BIOS\n");
+		printk(KERN_NOTICE "radeonfb: Failed to detect DFP panel info using BIOS\n");
 		return 0;
 	}
 
 	if (!(tmp = rinfo->bios_seg + readw(fpbiosstart + 0x40))) {
-		printk("radeonfb: Failed to detect DFP panel info using BIOS\n");
+		printk(KERN_NOTICE "radeonfb: Failed to detect DFP panel info using BIOS\n");
 		return 0;
 	}
 
 	for(i=0; i<24; i++)
 		stmp[i] = readb(tmp+i+1);
 	stmp[24] = 0;
-	printk("radeonfb: panel ID string: %s\n", stmp);
+	pr_info("radeonfb: panel ID string: %s\n", stmp);
 	rinfo->panel_xres = readw(tmp + 25);
 	rinfo->panel_yres = readw(tmp + 27);
-	printk("radeonfb: detected DFP panel size from BIOS: %dx%d\n",
+	pr_info("radeonfb: detected DFP panel size from BIOS: %dx%d\n",
 		rinfo->panel_xres, rinfo->panel_yres);
 
 	for(i=0; i<32; i++) {
@@ -1155,11 +1150,11 @@ static int radeon_get_dfpinfo (struct ra
 				rinfo->panel_xres = 1600;
 				break;
 			default:
-				printk("radeonfb: Failed to detect DFP panel size\n");
+				printk(KERN_NOTICE "radeonfb: Failed to detect DFP panel size\n");
 				return 0;
 		}
 
-		printk("radeonfb: detected DFP panel size from registers: %dx%d\n",
+		pr_info("radeonfb: detected DFP panel size from registers: %dx%d\n",
 			rinfo->panel_xres, rinfo->panel_yres);
 
 		tmp = INREG(FP_CRTC_H_TOTAL_DISP);
@@ -1329,20 +1324,20 @@ static int radeon_do_maximize(struct rad
   
         /* use highest possible virtual resolution */
         if (v->xres_virtual == -1 && v->yres_virtual == -1) {
-                printk("radeonfb: using max available virtual resolution\n");
+                pr_info("radeonfb: using max available virtual resolution\n");
                 for (i=0; modes[i].xres != -1; i++) {
                         if (modes[i].xres * nom / den * modes[i].yres <
                             rinfo->video_ram / 2)
                                 break;
                 }
                 if (modes[i].xres == -1) {
-                        printk("radeonfb: could not find virtual resolution that fits into video memory!\n");
+                        printk(KERN_NOTICE "radeonfb: could not find virtual resolution that fits into video memory!\n");
                         return -EINVAL;
                 }
                 v->xres_virtual = modes[i].xres;  
                 v->yres_virtual = modes[i].yres;
                 
-                printk("radeonfb: virtual resolution set to max of %dx%d\n",
+                pr_info("radeonfb: virtual resolution set to max of %dx%d\n",
                         v->xres_virtual, v->yres_virtual);
         } else if (v->xres_virtual == -1) {
                 v->xres_virtual = (rinfo->video_ram * den /   
@@ -1447,7 +1442,7 @@ static int radeonfb_check_var (struct fb
                         v.transp.length = 8;
                         break;
                 default:
-                        printk ("radeonfb: mode %dx%dx%d rejected, color depth invalid\n",
+                        printk (KERN_ERR "radeonfb: mode %dx%dx%d rejected, color depth invalid\n",
                                 var->xres, var->yres, var->bits_per_pixel);
                         return -EINVAL;
         }
@@ -1980,7 +1975,7 @@ static int radeonfb_set_par (struct fb_i
 	RTRACE("vclk_freq = %d, per = %d\n", vclk_freq, xclk_per_trans_precise);
 
 	if ((ron + rinfo->ram.rloop) >= roff) {
-		printk("radeonfb: error ron out of range\n");
+		printk(KERN_ERR "radeonfb: error ron out of range\n");
 		return -EINVAL;
 	}
 
@@ -2772,7 +2767,7 @@ int radeon_sleep_notify(struct pmu_sleep
 
 				radeonfb_blank(0, (struct fb_info *)rinfo);
 				release_console_sem();
-				printk("CLK_PIN_CNTL on wakeup was: %08x\n", dbg_clk);
+				printk(KERN_DEBUG "CLK_PIN_CNTL on wakeup was: %08x\n", dbg_clk);
 				break;
 		}
 	}
@@ -2799,7 +2794,7 @@ static int radeonfb_pci_register (struct
 
 	rinfo = kmalloc (sizeof (struct radeonfb_info), GFP_KERNEL);
 	if (!rinfo) {
-		printk ("radeonfb: could not allocate memory\n");
+		printk (KERN_ERR "radeonfb: could not allocate memory\n");
 		return -ENODEV;
 	}
 
@@ -2816,14 +2811,14 @@ static int radeonfb_pci_register (struct
 	/* request the mem regions */
 	if (!request_mem_region (rinfo->fb_base_phys,
 				 pci_resource_len(pdev, 0), "radeonfb")) {
-		printk ("radeonfb: cannot reserve FB region\n");
+		printk (KERN_ERR "radeonfb: cannot reserve FB region\n");
 		kfree (rinfo);
 		return -ENODEV;
 	}
 
 	if (!request_mem_region (rinfo->mmio_base_phys,
 				 pci_resource_len(pdev, 2), "radeonfb")) {
-		printk ("radeonfb: cannot reserve MMIO region\n");
+		printk (KERN_ERR "radeonfb: cannot reserve MMIO region\n");
 		release_mem_region (rinfo->fb_base_phys,
 				    pci_resource_len(pdev, 0));
 		kfree (rinfo);
@@ -2833,7 +2828,7 @@ static int radeonfb_pci_register (struct
 	/* map the regions */
 	rinfo->mmio_base = ioremap (rinfo->mmio_base_phys, RADEON_REGSIZE);
 	if (!rinfo->mmio_base) {
-		printk ("radeonfb: cannot map MMIO\n");
+		printk (KERN_ERR "radeonfb: cannot map MMIO\n");
 		release_mem_region (rinfo->mmio_base_phys,
 				    pci_resource_len(pdev, 2));
 		release_mem_region (rinfo->fb_base_phys,
@@ -2862,7 +2857,7 @@ static int radeonfb_pci_register (struct
 	}
 #endif
 	if (mirror)
-		printk("radeonfb: mirroring display to CRT\n");
+		pr_info("radeonfb: mirroring display to CRT\n");
 
 	/* framebuffer size */
 	tmp = INREG(CONFIG_MEMSIZE);
@@ -2970,7 +2965,7 @@ static int radeonfb_pci_register (struct
 
 	rinfo->fb_base = ioremap (rinfo->fb_base_phys, rinfo->video_ram);
 	if (!rinfo->fb_base) {
-		printk ("radeonfb: cannot map FB\n");
+		printk (KERN_ERR "radeonfb: cannot map FB\n");
 		iounmap(rinfo->mmio_base);
 		release_mem_region (rinfo->mmio_base_phys,
 				    pci_resource_len(pdev, 2));
@@ -3022,7 +3017,7 @@ static int radeonfb_pci_register (struct
 	board_list = rinfo;
 	((struct fb_info *) rinfo)->device = &pdev->dev;
 	if (register_framebuffer ((struct fb_info *) rinfo) < 0) {
-		printk ("radeonfb: could not register framebuffer\n");
+		printk (KERN_ERR "radeonfb: could not register framebuffer\n");
 		iounmap(rinfo->fb_base);
 		iounmap(rinfo->mmio_base);
 		release_mem_region (rinfo->mmio_base_phys,
@@ -3052,16 +3047,16 @@ static int radeonfb_pci_register (struct
 	}
 #endif
 
-	printk ("radeonfb: ATI Radeon %s %s %d MB\n", rinfo->name, rinfo->ram_type,
+	pr_info ("radeonfb: ATI Radeon %s %s %d MB\n", rinfo->name, rinfo->ram_type,
 		(rinfo->video_ram/(1024*1024)));
 
 	if (rinfo->hasCRTC2) {
-		printk("radeonfb: DVI port %s monitor connected\n",
+		pr_info("radeonfb: DVI port %s monitor connected\n",
 			GET_MON_NAME(rinfo->dviDisp_type));
-		printk("radeonfb: CRT port %s monitor connected\n",
+		pr_info("radeonfb: CRT port %s monitor connected\n",
 			GET_MON_NAME(rinfo->crtDisp_type));
 	} else {
-		printk("radeonfb: CRT port %s monitor connected\n",
+		pr_info("radeonfb: CRT port %s monitor connected\n",
 			GET_MON_NAME(rinfo->crtDisp_type));
 	}
 
Index: quilt/drivers/video/retz3fb.c
===================================================================
--- quilt.orig/drivers/video/retz3fb.c
+++ quilt/drivers/video/retz3fb.c
@@ -20,6 +20,8 @@
  * for more details.
  */
 
+#undef DEBUG
+
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
@@ -44,9 +46,6 @@
 
 #include "retz3fb.h"
 
-/* #define DEBUG if(1) */
-#define DEBUG if(0)
-
 /*
  * Reserve space for one pattern line.
  *
@@ -125,6 +124,7 @@ static char fontname[40] __initdata = { 
 
 static char retz3fb_name[16] = "RetinaZ3";
 
+#define DBG(fmt, args...) pr_debug("%s %s: " fmt, retz3fb_name, __FUNCTION__ , ## args)
 
 /*
  * A small info on how to convert XFree86 timing values into fb
@@ -455,25 +455,25 @@ static int retz3_set_video(struct fb_inf
 
 #if 0 /* testing */
 
-	printk("HBS: %i\n", data.h_bstart);
-	printk("HSS: %i\n", data.h_sstart);
-	printk("HSE: %i\n", data.h_sstop);
-	printk("HBE: %i\n", data.h_bstop);
-	printk("HT: %i\n", data.h_total);
-
-	printk("hsync: %i\n", hsync);
-	printk("hfront: %i\n", hfront);
-	printk("hback: %i\n", hback);
-
-	printk("VBS: %i\n", data.v_bstart);
-	printk("VSS: %i\n", data.v_sstart);
-	printk("VSE: %i\n", data.v_sstop);
-	printk("VBE: %i\n", data.v_bstop);
-	printk("VT: %i\n", data.v_total);
-
-	printk("vsync: %i\n", vsync);
-	printk("vfront: %i\n", vfront);
-	printk("vback: %i\n", vback);
+	DBG("HBS: %i\n", data.h_bstart);
+	DBG("HSS: %i\n", data.h_sstart);
+	DBG("HSE: %i\n", data.h_sstop);
+	DBG("HBE: %i\n", data.h_bstop);
+	DBG("HT: %i\n", data.h_total);
+
+	DBG("hsync: %i\n", hsync);
+	DBG("hfront: %i\n", hfront);
+	DBG("hback: %i\n", hback);
+
+	DBG("VBS: %i\n", data.v_bstart);
+	DBG("VSS: %i\n", data.v_sstart);
+	DBG("VSE: %i\n", data.v_sstop);
+	DBG("VBE: %i\n", data.v_bstop);
+	DBG("VT: %i\n", data.v_total);
+
+	DBG("vsync: %i\n", vsync);
+	DBG("vfront: %i\n", vfront);
+	DBG("vback: %i\n", vback);
 #endif
 
 	if (data.v_total >= 1024)
@@ -548,28 +548,28 @@ static int retz3_set_video(struct fb_inf
 	crt_w(regs, CRT_END_VER_RETR, (data.v_sstop & 0x0f) | 0x20);
 
 	/* Zuerst zu schreibende Werte nur per printk ausgeben */
-	DEBUG printk("CRT_HOR_TOTAL: %ld\n", data.h_total);
+	DBG("CRT_HOR_TOTAL: %ld\n", data.h_total);
 	crt_w(regs, CRT_HOR_TOTAL, data.h_total & 0xff);
 
-	DEBUG printk("CRT_HOR_DISP_ENA_END: %ld\n", data.h_dispend);
+	DBG("CRT_HOR_DISP_ENA_END: %ld\n", data.h_dispend);
 	crt_w(regs, CRT_HOR_DISP_ENA_END, (data.h_dispend) & 0xff);
 
-	DEBUG printk("CRT_START_HOR_BLANK: %ld\n", data.h_bstart);
+	DBG("CRT_START_HOR_BLANK: %ld\n", data.h_bstart);
 	crt_w(regs, CRT_START_HOR_BLANK, data.h_bstart & 0xff);
 
-	DEBUG printk("CRT_END_HOR_BLANK: 128+%ld\n", data.h_bstop % 32);
+	DBG("CRT_END_HOR_BLANK: 128+%ld\n", data.h_bstop % 32);
 	crt_w(regs, CRT_END_HOR_BLANK,  0x80 | (data.h_bstop & 0x1f));
 
-	DEBUG printk("CRT_START_HOR_RETR: %ld\n", data.h_sstart);
+	DBG("CRT_START_HOR_RETR: %ld\n", data.h_sstart);
 	crt_w(regs, CRT_START_HOR_RETR, data.h_sstart & 0xff);
 
 	tmp = (data.h_sstop & 0x1f);
 	if (data.h_bstop & 0x20)
 		tmp |= 0x80;
-	DEBUG printk("CRT_END_HOR_RETR: %d\n", tmp);
+	DBG("CRT_END_HOR_RETR: %d\n", tmp);
 	crt_w(regs, CRT_END_HOR_RETR, tmp);
 
-	DEBUG printk("CRT_VER_TOTAL: %ld\n", data.v_total & 0xff);
+	DBG("CRT_VER_TOTAL: %ld\n", data.v_total & 0xff);
 	crt_w(regs, CRT_VER_TOTAL, (data.v_total & 0xff));
 
 	tmp = 0x10;  /* LineCompare bit #9 */
@@ -587,7 +587,7 @@ static int retz3_set_video(struct fb_inf
 		tmp |= 0x40;
 	if (data.v_sstart & 512)
 		tmp |= 0x80;
-	DEBUG printk("CRT_OVERFLOW: %d\n", tmp);
+	DBG("CRT_OVERFLOW: %d\n", tmp);
 	crt_w(regs, CRT_OVERFLOW, tmp);
 
 	crt_w(regs, CRT_PRESET_ROW_SCAN, 0x00); /* not CL !!! */
@@ -597,7 +597,7 @@ static int retz3_set_video(struct fb_inf
 		tmp |= 0x20;
 	if (var->vmode & FB_VMODE_DOUBLE)
 		tmp |= 0x80;
- 	DEBUG printk("CRT_MAX_SCAN_LINE: %d\n", tmp);
+ 	DBG("CRT_MAX_SCAN_LINE: %d\n", tmp);
 	crt_w(regs, CRT_MAX_SCAN_LINE, tmp);
 
 	crt_w(regs, CRT_CURSOR_START, 0x00);
@@ -609,30 +609,30 @@ static int retz3_set_video(struct fb_inf
 	crt_w(regs, CRT_CURSOR_LOC_HIGH, 0x00);
 	crt_w(regs, CRT_CURSOR_LOC_LOW, 0x00);
 
- 	DEBUG printk("CRT_START_VER_RETR: %ld\n", data.v_sstart & 0xff);
+ 	DBG("CRT_START_VER_RETR: %ld\n", data.v_sstart & 0xff);
 	crt_w(regs, CRT_START_VER_RETR, (data.v_sstart & 0xff));
 
 #if 1
 	/* 5 refresh cycles per scanline */
-	DEBUG printk("CRT_END_VER_RETR: 64+32+%ld\n", data.v_sstop % 16);
+	DBG("CRT_END_VER_RETR: 64+32+%ld\n", data.v_sstop % 16);
 	crt_w(regs, CRT_END_VER_RETR, ((data.v_sstop & 0x0f) | 0x40 | 0x20));
 #else
-	DEBUG printk("CRT_END_VER_RETR: 128+32+%ld\n", data.v_sstop % 16);
+	DBG("CRT_END_VER_RETR: 128+32+%ld\n", data.v_sstop % 16);
 	crt_w(regs, CRT_END_VER_RETR, ((data.v_sstop & 0x0f) | 128 | 32));
 #endif
-	DEBUG printk("CRT_VER_DISP_ENA_END: %ld\n", data.v_dispend & 0xff);
+	DBG("CRT_VER_DISP_ENA_END: %ld\n", data.v_dispend & 0xff);
 	crt_w(regs, CRT_VER_DISP_ENA_END, (data.v_dispend & 0xff));
 
-	DEBUG printk("CRT_START_VER_BLANK: %ld\n", data.v_bstart & 0xff);
+	DBG("CRT_START_VER_BLANK: %ld\n", data.v_bstart & 0xff);
 	crt_w(regs, CRT_START_VER_BLANK, (data.v_bstart & 0xff));
 
-	DEBUG printk("CRT_END_VER_BLANK: %ld\n", data.v_bstop & 0xff);
+	DBG("CRT_END_VER_BLANK: %ld\n", data.v_bstop & 0xff);
 	crt_w(regs, CRT_END_VER_BLANK, (data.v_bstop & 0xff));
 
-	DEBUG printk("CRT_MODE_CONTROL: 0xe3\n");
+	DBG("CRT_MODE_CONTROL: 0xe3\n");
 	crt_w(regs, CRT_MODE_CONTROL, 0xe3);
 
-	DEBUG printk("CRT_LINE_COMPARE: 0xff\n");
+	DBG("CRT_LINE_COMPARE: 0xff\n");
 	crt_w(regs, CRT_LINE_COMPARE, 0xff);
 
 	tmp = (var->xres_virtual / 8) * (bpp / 8);
@@ -651,7 +651,7 @@ static int retz3_set_video(struct fb_inf
 		tmp |= 0x08;
 	if (var->vmode & FB_VMODE_INTERLACED)
 		tmp |= 0x10;
- 	DEBUG printk("CRT_EXT_HOR_TIMING1: %d\n", tmp);
+ 	DBG("CRT_EXT_HOR_TIMING1: %d\n", tmp);
 	crt_w(regs, CRT_EXT_HOR_TIMING1, tmp);
 
 	tmp = 0x00;
@@ -671,7 +671,7 @@ static int retz3_set_video(struct fb_inf
 	tmp |= ((data.h_bstop & 0xc0) >> 2);
 	tmp |= ((data.h_sstop & 0x60) << 1);
 	crt_w(regs, CRT_EXT_HOR_TIMING2, tmp);
- 	DEBUG printk("CRT_EXT_HOR_TIMING2: %d\n", tmp);
+ 	DBG("CRT_EXT_HOR_TIMING2: %d\n", tmp);
 
 	tmp = 0x10;			/* Line compare bit 10 */
 	if (data.v_total & 0x400)
@@ -686,7 +686,7 @@ static int retz3_set_video(struct fb_inf
 	if (data.v_sstop & 0x10)
 		tmp |= 0x80;
 	crt_w(regs, CRT_EXT_VER_TIMING, tmp);
- 	DEBUG printk("CRT_EXT_VER_TIMING: %d\n", tmp);
+ 	DBG("CRT_EXT_VER_TIMING: %d\n", tmp);
 
 	crt_w(regs, CRT_MONITOR_POWER, 0x00);
 
Index: quilt/drivers/video/riva/fbdev.c
===================================================================
--- quilt.orig/drivers/video/riva/fbdev.c
+++ quilt/drivers/video/riva/fbdev.c
@@ -68,9 +68,10 @@
  *
  * ------------------------------------------------------------------------- */
 #ifdef CONFIG_FB_RIVA_DEBUG
-#define NVTRACE          printk
+#define DEBUG
+#define NVTRACE          pr_debug
 #else
-#define NVTRACE          if(0) printk
+#define NVTRACE          if(0) pr_debug
 #endif
 
 #define NVTRACE_ENTER(...)  NVTRACE("%s START\n", __FUNCTION__)
@@ -79,7 +80,7 @@
 #ifdef CONFIG_FB_RIVA_DEBUG
 #define assert(expr) \
 	if(!(expr)) { \
-	printk( "Assertion failed! %s,%s,%s,line=%d\n",\
+	pr_debug( "Assertion failed! %s,%s,%s,line=%d\n",\
 	#expr,__FILE__,__FUNCTION__,__LINE__); \
 	BUG(); \
 	}
@@ -1779,7 +1780,7 @@ static int __devinit riva_get_EDID_i2c(s
 	for (i = 0; i < par->bus; i++) {
 		riva_probe_i2c_connector(par, i+1, &par->EDID);
 		if (par->EDID && !fb_parse_edid(par->EDID, &var)) {
-			printk(PFX "Found EDID Block from BUS %i\n", i);
+			pr_info(PFX "Found EDID Block from BUS %i\n", i);
 			break;
 		}
 	}
@@ -1828,10 +1829,10 @@ static void __devinit riva_get_EDID(stru
 	NVTRACE_ENTER();
 #ifdef CONFIG_PPC_OF
 	if (!riva_get_EDID_OF(info, pdev))
-		printk(PFX "could not retrieve EDID from OF\n");
+		pr_info(PFX "could not retrieve EDID from OF\n");
 #elif CONFIG_FB_RIVA_I2C
 	if (!riva_get_EDID_i2c(info))
-		printk(PFX "could not retrieve EDID from DDC/I2C\n");
+		pr_info(PFX "could not retrieve EDID from DDC/I2C\n");
 #endif
 	NVTRACE_LEAVE();
 }
Index: quilt/drivers/video/savage/savagefb_driver.c
===================================================================
--- quilt.orig/drivers/video/savage/savagefb_driver.c
+++ quilt/drivers/video/savage/savagefb_driver.c
@@ -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, "
Index: quilt/drivers/video/sstfb.c
===================================================================
--- quilt.orig/drivers/video/sstfb.c
+++ quilt/drivers/video/sstfb.c
@@ -790,7 +790,7 @@ static int sstfb_ioctl(struct inode *ino
 			return -EFAULT;
 		if (val > info->fix.smem_len)
 			val = info->fix.smem_len;
-		printk("filling %#x \n", val);
+		printk(KERN_DEBUG "filling %#x \n", val);
 		for (p=0 ; p<val; p+=2)
 			writew(p >> 6, info->screen_base + p);
 		return 0;
Index: quilt/drivers/video/sun3fb.c
===================================================================
--- quilt.orig/drivers/video/sun3fb.c
+++ quilt/drivers/video/sun3fb.c
@@ -645,7 +645,7 @@ sizechange:
 		kfree(fb);
 		return -EINVAL;
 	}
-	printk("fb%d: %s\n", fb->info.node, p);
+	pr_info("fb%d: %s\n", fb->info.node, p);
 
 	return 0;
 }
@@ -667,14 +667,14 @@ int __init sun3fb_init(void)
 	case FBTYPE_SUN3COLOR:
 	case FBTYPE_SUN4COLOR:
 		if(idprom->id_machtype != (SM_SUN3|SM_3_60)) {
-			printk("sun3fb: cgthree/four only supported on 3/60\n");
+			printk(KERN_ERR "sun3fb: cgthree/four only supported on 3/60\n");
 			return -ENODEV;
 		}
 		
 		addr = CGFOUR_OBMEM_ADDR;
 		return sun3fb_init_fb(*(romvec->pv_fbtype), addr);
 	default:
-		printk("sun3fb: unsupported framebuffer\n");
+		printk(KERN_ERR "sun3fb: unsupported framebuffer\n");
 		return -ENODEV;
 	}
 #else
Index: quilt/drivers/video/tcx.c
===================================================================
--- quilt.orig/drivers/video/tcx.c
+++ quilt/drivers/video/tcx.c
@@ -462,7 +462,7 @@ static void tcx_init_one(struct sbus_dev
 
 	list_add(&all->list, &tcx_list);
 
-	printk("tcx: %s at %lx:%lx, %s\n",
+	pr_info("tcx: %s at %lx:%lx, %s\n",
 	       sdev->prom_name,
 	       (long) sdev->reg_addrs[0].which_io,
 	       (long) sdev->reg_addrs[0].phys_addr,
Index: quilt/drivers/video/tdfxfb.c
===================================================================
--- quilt.orig/drivers/video/tdfxfb.c
+++ quilt/drivers/video/tdfxfb.c
@@ -4,7 +4,7 @@
  *
  * Author: Hannu Mallat <hmallat@cc.hut.fi>
  *
- * Copyright � 1999 Hannu Mallat
+ * Copyright  1999 Hannu Mallat
  * All rights reserved
  *
  * Created      : Thu Sep 23 18:17:43 1999, hmallat
@@ -1193,7 +1193,7 @@ static int __devinit tdfxfb_probe(struct
 	tdfx_fix.mmio_len = pci_resource_len(pdev, 0);
 	default_par->regbase_virt = ioremap_nocache(tdfx_fix.mmio_start, tdfx_fix.mmio_len);
 	if (!default_par->regbase_virt) {
-		printk("fb: Can't remap %s register area.\n", tdfx_fix.id);
+		printk(KERN_WARNING "fb: Can't remap %s register area.\n", tdfx_fix.id);
 		goto out_err;
 	}
     
@@ -1205,7 +1205,7 @@ static int __devinit tdfxfb_probe(struct
 
 	tdfx_fix.smem_start = pci_resource_start(pdev, 1);
 	if (!(tdfx_fix.smem_len = do_lfb_size(default_par, pdev->device))) {
-		printk("fb: Can't count %s memory.\n", tdfx_fix.id);
+		printk(KERN_WARNING "fb: Can't count %s memory.\n", tdfx_fix.id);
 		release_mem_region(pci_resource_start(pdev, 0),
 				   pci_resource_len(pdev, 0));
 		goto out_err;	
@@ -1222,7 +1222,7 @@ static int __devinit tdfxfb_probe(struct
 	info->screen_base = ioremap_nocache(tdfx_fix.smem_start, 
 					    tdfx_fix.smem_len);
 	if (!info->screen_base) {
-		printk("fb: Can't remap %s framebuffer.\n", tdfx_fix.id);
+		printk(KERN_WARNING "fb: Can't remap %s framebuffer.\n", tdfx_fix.id);
 		release_mem_region(pci_resource_start(pdev, 1),
 				   pci_resource_len(pdev, 1));
 		release_mem_region(pci_resource_start(pdev, 0),
@@ -1242,7 +1242,7 @@ static int __devinit tdfxfb_probe(struct
 		goto out_err;
 	}
 
-	printk("fb: %s memory = %dK\n", tdfx_fix.id, tdfx_fix.smem_len >> 10);
+	pr_info("fb: %s memory = %dK\n", tdfx_fix.id, tdfx_fix.smem_len >> 10);
 
 	tdfx_fix.ypanstep	= nopan ? 0 : 1;
 	tdfx_fix.ywrapstep	= nowrap ? 0 : 1;
@@ -1285,7 +1285,7 @@ static int __devinit tdfxfb_probe(struct
 	}
 
 	if (register_framebuffer(info) < 0) {
-		printk("tdfxfb: can't register framebuffer\n");
+		printk(KERN_WARNING "tdfxfb: can't register framebuffer\n");
 		fb_dealloc_cmap(&info->cmap);
 		goto out_err;
 	}
Index: quilt/drivers/video/virgefb.c
===================================================================
--- quilt.orig/drivers/video/virgefb.c
+++ quilt/drivers/video/virgefb.c
@@ -1,7 +1,7 @@
 /*
  * linux/drivers/video/virgefb.c -- CyberVision64/3D frame buffer device
  *
- *    Copyright (C) 1997 Andr� Heynatz
+ *    Copyright (C) 1997 Andr�Heynatz
  *
  *
  * This file is based on the CyberVision frame buffer device (cyberfb.c):
@@ -2157,7 +2157,7 @@ static unsigned short virgefb_compute_cl
 		}
 	}
 	if (save == ~0UL)
-		printk("Can't compute clock PLL values for %ld Hz clock\n", freq);
+		printk(KERN_NOTICE "Can't compute clock PLL values for %ld Hz clock\n", freq);
 	DPRINTK("EXIT\n");
 	return(mnr);
 }
@@ -2435,20 +2435,20 @@ static void cv64_dump(void)
 	printk("\n");
 	for (i = 0; i <= 0x6f; i++) {
 		wb_mmio(CRT_ADDRESS, i);
-		printk("crt idx : 0x%2.2x : 0x%2.2x\n", i, rb_mmio(CRT_ADDRESS_R));
+		pr_info("crt idx : 0x%2.2x : 0x%2.2x\n", i, rb_mmio(CRT_ADDRESS_R));
 	}
 	for (i = 0; i <= 0x1c; i++) {
 		wb_mmio(SEQ_ADDRESS, i);
-		printk("seq idx : 0x%2.2x : 0x%2.2x\n", i, rb_mmio(SEQ_ADDRESS_R));
+		pr_info("seq idx : 0x%2.2x : 0x%2.2x\n", i, rb_mmio(SEQ_ADDRESS_R));
 	}
 	for (i = 0; i <= 8; i++) {
 		wb_mmio(GCT_ADDRESS, i);
-		printk("gfx idx : 0x%2.2x : 0x%2.2x\n", i, rb_mmio(GCT_ADDRESS_R));
+		pr_info("gfx idx : 0x%2.2x : 0x%2.2x\n", i, rb_mmio(GCT_ADDRESS_R));
 	}
 	for (i = 0; i <= 0x14; i++) {
 		c = rb_mmio(ACT_ADDRESS_RESET);
 		wb_mmio(ACT_ADDRESS_W, i);
-		printk("atr idx : 0x%2.2x : 0x%2.2x\n", i, rb_mmio(ACT_ADDRESS_R));
+		pr_info("atr idx : 0x%2.2x : 0x%2.2x\n", i, rb_mmio(ACT_ADDRESS_R));
 	}
 
 	/* re-enable video access to palette */
@@ -2461,23 +2461,23 @@ static void cv64_dump(void)
 
 	/* general regs */
 
-	printk("0x3cc(w 0x3c2) : 0x%2.2x\n", rb_mmio(0x3cc));	/* GREG_MISC_OUTPUT READ */
-	printk("0x3c2(-------) : 0x%2.2x\n", rb_mmio(0x3c2));	/* GREG_INPUT_STATUS 0 READ */
-	printk("0x3c3(w 0x3c3) : 0x%2.2x\n", rb_vgaio(0x3c3));	/* GREG_VIDEO_SUBS_ENABLE */
-	printk("0x3ca(w 0x3da) : 0x%2.2x\n", rb_vgaio(0x3ca));	/* GREG_FEATURE_CONTROL read */
-	printk("0x3da(-------) : 0x%2.2x\n", rb_mmio(0x3da));	/* GREG_INPUT_STATUS 1 READ */
+	pr_info("0x3cc(w 0x3c2) : 0x%2.2x\n", rb_mmio(0x3cc));	/* GREG_MISC_OUTPUT READ */
+	pr_info("0x3c2(-------) : 0x%2.2x\n", rb_mmio(0x3c2));	/* GREG_INPUT_STATUS 0 READ */
+	pr_info("0x3c3(w 0x3c3) : 0x%2.2x\n", rb_vgaio(0x3c3));	/* GREG_VIDEO_SUBS_ENABLE */
+	pr_info("0x3ca(w 0x3da) : 0x%2.2x\n", rb_vgaio(0x3ca));	/* GREG_FEATURE_CONTROL read */
+	pr_info("0x3da(-------) : 0x%2.2x\n", rb_mmio(0x3da));	/* GREG_INPUT_STATUS 1 READ */
 
 	/* engine regs */
 
 	for (i = 0x8180; i <= 0x8200; i = i + 4)
-		printk("0x%8.8x : 0x%8.8x\n", i, rl_mmio(i));
+		pr_info("0x%8.8x : 0x%8.8x\n", i, rl_mmio(i));
 
 	i = 0x8504;
-	printk("0x%8.8x : 0x%8.8x\n", i, rl_mmio(i));
+	pr_info("0x%8.8x : 0x%8.8x\n", i, rl_mmio(i));
 	i = 0x850c;
-	printk("0x%8.8x : 0x%8.8x\n", i, rl_mmio(i));
+	pr_info("0x%8.8x : 0x%8.8x\n", i, rl_mmio(i));
 	for (i = 0xa4d4; i <= 0xa50c; i = i + 4)
-		printk("0x%8.8x : 0x%8.8x\n", i, rl_mmio(i));
+		pr_info("0x%8.8x : 0x%8.8x\n", i, rl_mmio(i));
 
 	/* PCI regs */
 
@@ -2485,29 +2485,29 @@ static void cv64_dump(void)
 
 	for (c = 0; c < 0x08; c = c + 2) {
 		w = (*((u16 *)((u32)(vgaio_regs + c + (on_zorro2 ? 0 : 0x000e0000)) ^ 2)));
-		printk("pci 0x%2.2x : 0x%4.4x\n", c, w);
+		pr_info("pci 0x%2.2x : 0x%4.4x\n", c, w);
 	}
 	c = 8;
 	l = (*((u32 *)((u32)(vgaio_regs + c + (on_zorro2 ? 0 : 0x000e0000)))));
-	printk("pci 0x%2.2x : 0x%8.8x\n", c, l);
+	pr_info("pci 0x%2.2x : 0x%8.8x\n", c, l);
 	c = 0x0d;
 	b = (*((u8 *)((u32)(vgaio_regs + c + (on_zorro2 ? 0 : 0x000e0000)) ^ 3)));
-	printk("pci 0x%2.2x : 0x%2.2x\n", c, b);
+	pr_info("pci 0x%2.2x : 0x%2.2x\n", c, b);
 	c = 0x10;
 	l = (*((u32 *)((u32)(vgaio_regs + c + (on_zorro2 ? 0 : 0x000e0000)))));
-	printk("pci 0x%2.2x : 0x%8.8x\n", c, l);
+	pr_info("pci 0x%2.2x : 0x%8.8x\n", c, l);
 	c = 0x30;
 	l = (*((u32 *)((u32)(vgaio_regs + c + (on_zorro2 ? 0 : 0x000e0000)))));
-	printk("pci 0x%2.2x : 0x%8.8x\n", c, l);
+	pr_info("pci 0x%2.2x : 0x%8.8x\n", c, l);
 	c = 0x3c;
 	b = (*((u8 *)((u32)(vgaio_regs + c + (on_zorro2 ? 0 : 0x000e0000)) ^ 3)));
-	printk("pci 0x%2.2x : 0x%2.2x\n", c, b);
+	pr_info("pci 0x%2.2x : 0x%2.2x\n", c, b);
 	c = 0x3d;
 	b = (*((u8 *)((u32)(vgaio_regs + c + (on_zorro2 ? 0 : 0x000e0000)) ^ 3)));
-	printk("pci 0x%2.2x : 0x%2.2x\n", c, b);
+	pr_info("pci 0x%2.2x : 0x%2.2x\n", c, b);
 	c = 0x3e;
 	w = (*((u16 *)((u32)(vgaio_regs + c + (on_zorro2 ? 0 : 0x000e0000)) ^ 2)));
-	printk("pci 0x%2.2x : 0x%4.4x\n", c, w);
+	pr_info("pci 0x%2.2x : 0x%4.4x\n", c, w);
 	SelectMMIO;
 }
 #endif
Index: quilt/drivers/video/w100fb.c
===================================================================
--- quilt.orig/drivers/video/w100fb.c
+++ quilt/drivers/video/w100fb.c
@@ -140,7 +140,7 @@ static ssize_t w100fb_reg_read(struct de
 	unsigned long regs;
 	regs = simple_strtoul(buf, NULL, 16);
 	param = readl(remapped_regs + regs);
-	printk("Read Register 0x%08lX: 0x%08lX\n", regs, param);
+	printk(KERN_DEBUG "Read Register 0x%08lX: 0x%08lX\n", regs, param);
 	return count;
 }
 
@@ -153,7 +153,7 @@ static ssize_t w100fb_reg_write(struct d
 	sscanf(buf, "%lx %lx", &regs, &param);
 
 	if (regs <= 0x2000) {
-		printk("Write Register 0x%08lX: 0x%08lX\n", regs, param);
+		printk(KERN_DEBUG "Write Register 0x%08lX: 0x%08lX\n", regs, param);
 		writel(param, remapped_regs + regs);
 	}
 
@@ -180,11 +180,11 @@ static ssize_t fastsysclk_store(struct d
 	param = simple_strtoul(buf, NULL, 10);
 
 	if (param == 75) {
-		printk("Set fastsysclk %d\n", param);
+		printk(KERN_DEBUG "Set fastsysclk %d\n", param);
 		par->fastsysclk_mode = param;
 		w100_set_fastsysclk(par->fastsysclk_mode);
 	} else if (param == 100) {
-		printk("Set fastsysclk %d\n", param);
+		printk(KERN_DEBUG "Set fastsysclk %d\n", param);
 		par->fastsysclk_mode = param;
 		w100_set_fastsysclk(par->fastsysclk_mode);
 	}
