fbdev: Make the switch from generic to native driver less alarming

Calling this "conflicting" just makes people think there's a problem
when there's not.

Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: David Herrmann <dh.herrmann@gmail.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
This commit is contained in:
Adam Jackson 2014-02-12 16:02:02 -05:00 committed by Tomi Valkeinen
parent b7e4ab5041
commit 13ba0ad449

View File

@ -1596,8 +1596,7 @@ static int do_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_INFO "fb: conflicting fb hw usage " printk(KERN_INFO "fb: switching to %s from %s\n",
"%s vs %s - removing generic driver\n",
name, registered_fb[i]->fix.id); name, registered_fb[i]->fix.id);
ret = do_unregister_framebuffer(registered_fb[i]); ret = do_unregister_framebuffer(registered_fb[i]);
if (ret) if (ret)