Commit 47c87d93 authored Apr 04, 2011 by Matthew Garrett Committed by Paul Mundt Apr 06, 2011

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>

parent 787dffa5

drivers/video/fbmem.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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]);