Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 13ba0ad4 authored by Adam Jackson's avatar Adam Jackson Committed by Tomi Valkeinen
Browse files

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: default avatarAdam Jackson <ajax@redhat.com>
Reviewed-by: default avatarDavid Herrmann <dh.herrmann@gmail.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent b7e4ab50

drivers/video/fbmem.c

+1 −2
Original line number Diff line number Diff line
@@ -1596,8 +1596,7 @@ static int do_remove_conflicting_framebuffers(struct apertures_struct *a, 
			(primary && gen_aper && gen_aper->count &&

			 gen_aper->ranges[0].base == VGA_FB_PHYS)) {



			printk(KERN_INFO "fb: conflicting fb hw usage "

			       "%s vs %s - removing generic driver\n",

			printk(KERN_INFO "fb: switching to %s from %s\n",

			       name, registered_fb[i]->fix.id);

			ret = do_unregister_framebuffer(registered_fb[i]);

			if (ret)