This patch adds KERN_ constants to all of the printk()'s that need them in drivers/video/riva/fbdev.c Signed-off-by: James Nelson Signed-off-by: Domen Puncer --- kj-domen/drivers/video/riva/fbdev.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff -puN drivers/video/riva/fbdev.c~printk-drivers_video_riva_fbdev drivers/video/riva/fbdev.c --- kj/drivers/video/riva/fbdev.c~printk-drivers_video_riva_fbdev 2005-03-02 10:44:37.000000000 +0100 +++ kj-domen/drivers/video/riva/fbdev.c 2005-03-02 10:44:37.000000000 +0100 @@ -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(); \ } @@ -1780,7 +1781,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; } } @@ -1829,10 +1830,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(); } _