Commit 47c87d93 authored by Matthew Garrett's avatar Matthew Garrett Committed by Paul Mundt

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: default avatarMatthew Garrett <mjg@redhat.com>
Acked-by: default avatarDave Airlie <airlied@redhat.com>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 787dffa5
...@@ -1507,7 +1507,7 @@ void remove_conflicting_framebuffers(struct apertures_struct *a, ...@@ -1507,7 +1507,7 @@ void remove_conflicting_framebuffers(struct apertures_struct *a,
(primary && gen_aper && gen_aper->count && (primary && gen_aper && gen_aper->count &&
gen_aper->ranges[0].base == VGA_FB_PHYS)) { 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", "%s vs %s - removing generic driver\n",
name, registered_fb[i]->fix.id); name, registered_fb[i]->fix.id);
unregister_framebuffer(registered_fb[i]); unregister_framebuffer(registered_fb[i]);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment