From: Adam Jackson Date: Wed, 12 Feb 2014 21:02:02 +0000 (-0500) Subject: fbdev: Make the switch from generic to native driver less alarming X-Git-Tag: v3.15-rc1~86^2 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=13ba0ad4490c3dd08b15c430a7a01c6fb45d5bce;p=karo-tx-linux.git 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 Reviewed-by: David Herrmann Signed-off-by: Tomi Valkeinen --- diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c index 7309ac704e26..b6d5008f361f 100644 --- a/drivers/video/fbmem.c +++ b/drivers/video/fbmem.c @@ -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)