diff options
author | Adam Jackson <ajax@redhat.com> | 2014-02-12 16:02:02 -0500 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2014-04-03 05:47:16 -0400 |
commit | 13ba0ad4490c3dd08b15c430a7a01c6fb45d5bce (patch) | |
tree | 838ce5ce4b05497a219348a604c8afe27f31726b /drivers/video/fbmem.c | |
parent | b7e4ab50418d5b34ab0dae95193dd71190e1fb50 (diff) |
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>
Diffstat (limited to 'drivers/video/fbmem.c')
-rw-r--r-- | drivers/video/fbmem.c | 3 |
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, | |||
1596 | (primary && gen_aper && gen_aper->count && | 1596 | (primary && gen_aper && gen_aper->count && |
1597 | gen_aper->ranges[0].base == VGA_FB_PHYS)) { | 1597 | gen_aper->ranges[0].base == VGA_FB_PHYS)) { |
1598 | 1598 | ||
1599 | printk(KERN_INFO "fb: conflicting fb hw usage " | 1599 | printk(KERN_INFO "fb: switching to %s from %s\n", |
1600 | "%s vs %s - removing generic driver\n", | ||
1601 | name, registered_fb[i]->fix.id); | 1600 | name, registered_fb[i]->fix.id); |
1602 | ret = do_unregister_framebuffer(registered_fb[i]); | 1601 | ret = do_unregister_framebuffer(registered_fb[i]); |
1603 | if (ret) | 1602 | if (ret) |