aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntonino Daplas <adaplas@hotpop.com>2005-03-30 16:46:34 -0800
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-03-30 16:46:34 -0800
commit5c024519f6ec1a74ba2d4241a75744e2ce637093 (patch)
treea1c2fc837ddb4e92715500be1260832122dfc836
parent66db5e895fcffb726e38e1b6455e11f89b6ce6ef (diff)
downloadhistory-5c024519f6ec1a74ba2d4241a75744e2ce637093.tar.gz
[PATCH] tridentfb: Clean up printk()'s
This patch adds KERN_ constants to all of the printk()'s that need them in drivers/video/tridentfb.c Signed-off-by: James Nelson <james4765@gmail.com> Signed-off-by: Domen Puncer <domen@coderock.org> Signed-off-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/video/tridentfb.c2
-rw-r--r--include/video/trident.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/tridentfb.c b/drivers/video/tridentfb.c
index 61b994d9a0d658..da8004e5d03de6 100644
--- a/drivers/video/tridentfb.c
+++ b/drivers/video/tridentfb.c
@@ -1163,7 +1163,7 @@ static int __devinit trident_pci_probe(struct pci_dev * dev, const struct pci_de
fb_info.var = default_var;
fb_info.device = &dev->dev;
if (register_framebuffer(&fb_info) < 0) {
- output("Could not register Trident framebuffer\n");
+ printk(KERN_ERR "tridentfb: could not register Trident framebuffer\n");
return -EINVAL;
}
output("fb%d: %s frame buffer device %dx%d-%dbpp\n",
diff --git a/include/video/trident.h b/include/video/trident.h
index abe7d67756de7b..200be255168191 100644
--- a/include/video/trident.h
+++ b/include/video/trident.h
@@ -9,7 +9,7 @@
#define debug(f,a...)
#endif
-#define output(f, a...) printk("tridentfb: " f, ## a)
+#define output(f, a...) pr_info("tridentfb: " f, ## a)
#define Kb (1024)
#define Mb (Kb*Kb)