summaryrefslogtreecommitdiff
path: root/drivers/video
diff options
context:
space:
mode:
authorMatthew Garrett <mjg@redhat.com>2011-04-04 21:39:54 +0000
committerPaul Mundt <lethal@linux-sh.org>2011-04-06 09:58:29 -0700
commit47c87d930f3db4fc3a30505075e07f5597e2e953 (patch)
tree7eac2b7eaf80987ed84268863be2e61a6b245b61 /drivers/video
parent787dffa5c790fdae40a0706e0b3847e31282eb3b (diff)
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>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/fbmem.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index e2bf95370e40..e0c2284924b6 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]);