[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <aa66ee9749278e793e720037937c66c4d96c7517.1397812482.git.jslaby@suse.cz>
Date: Fri, 18 Apr 2014 11:21:54 +0200
From: Jiri Slaby <jslaby@...e.cz>
To: stable@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, Adam Jackson <ajax@...hat.com>,
Tomi Valkeinen <tomi.valkeinen@...com>,
Jiri Slaby <jslaby@...e.cz>
Subject: [PATCH 3.12 21/72] fbdev: Make the switch from generic to native driver less alarming
From: Adam Jackson <ajax@...hat.com>
3.12-stable review patch. If anyone has any objections, please let me know.
===============
commit 13ba0ad4490c3dd08b15c430a7a01c6fb45d5bce upstream.
Calling this "conflicting" just makes people think there's a problem
when there's not.
Signed-off-by: Adam Jackson <ajax@...hat.com>
Reviewed-by: David Herrmann <dh.herrmann@...il.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@...com>
Signed-off-by: Jiri Slaby <jslaby@...e.cz>
---
drivers/video/fbmem.c | 3 +--
1 file changed, 1 insertion(+), 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)
--
1.9.2
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists