summaryrefslogtreecommitdiff
path: root/drivers/video
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2014-02-12 16:02:02 -0500
committerJiri Slaby <jslaby@suse.cz>2014-04-18 11:04:16 +0200
commitaa66ee9749278e793e720037937c66c4d96c7517 (patch)
treefaf6654b9a240b8c0799e2e6ffd39b1f3ac749d5 /drivers/video
parent9419c62ccf280244e27f3007752cfb9818e46479 (diff)
fbdev: Make the switch from generic to native driver less alarming
commit 13ba0ad4490c3dd08b15c430a7a01c6fb45d5bce upstream. 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> Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/fbmem.c3
1 files changed, 1 insertions, 2 deletions
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)