From: Matthew Garrett <mjg@redhat.com>
Date: Mon, 4 Apr 2011 21:39:54 +0000 (+0000)
Subject: fb: Reduce priority of resource conflict message
X-Git-Tag: v2.6.39-rc3~14^2~2
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=47c87d930f3db4fc3a30505075e07f5597e2e953;p=~shefty%2Frdma-dev.git

fb: Reduce priority of resource conflict message

It's expected that efifb will conflict with a native driver, so the
handover message should be informational rather than an error.

Signed-off-by: Matthew Garrett <mjg@redhat.com>
Acked-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
---

diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index e2bf95370e4..e0c2284924b 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -1507,7 +1507,7 @@ void remove_conflicting_framebuffers(struct apertures_struct *a,
 			(primary && gen_aper && gen_aper->count &&
 			 gen_aper->ranges[0].base == VGA_FB_PHYS)) {
 
-			printk(KERN_ERR "fb: conflicting fb hw usage "
+			printk(KERN_INFO "fb: conflicting fb hw usage "
 			       "%s vs %s - removing generic driver\n",
 			       name, registered_fb[i]->fix.id);
 			unregister_framebuffer(registered_fb[i]);