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>

diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index 7309ac704e2641e410fe75f60278e273348573e3..b6d5008f361f99227ae7426366ca378493831540 100644 (file)
--- 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)