diff options
author | Matthew Garrett <mjg@redhat.com> | 2011-04-04 17:39:54 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-04-06 12:58:29 -0400 |
commit | 47c87d930f3db4fc3a30505075e07f5597e2e953 (patch) | |
tree | 7eac2b7eaf80987ed84268863be2e61a6b245b61 /drivers/video/fbmem.c | |
parent | 787dffa5c790fdae40a0706e0b3847e31282eb3b (diff) |
fb: Reduce priority of resource conflict message
It's expected that efifb will conflict with a native driver, so the
handover message should be informational rather than an error.
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Acked-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/video/fbmem.c')
-rw-r--r-- | drivers/video/fbmem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c index e2bf95370e40..e0c2284924b6 100644 --- a/drivers/video/fbmem.c +++ b/drivers/video/fbmem.c | |||
@@ -1507,7 +1507,7 @@ void remove_conflicting_framebuffers(struct apertures_struct *a, | |||
1507 | (primary && gen_aper && gen_aper->count && | 1507 | (primary && gen_aper && gen_aper->count && |
1508 | gen_aper->ranges[0].base == VGA_FB_PHYS)) { | 1508 | gen_aper->ranges[0].base == VGA_FB_PHYS)) { |
1509 | 1509 | ||
1510 | printk(KERN_ERR "fb: conflicting fb hw usage " | 1510 | printk(KERN_INFO "fb: conflicting fb hw usage " |
1511 | "%s vs %s - removing generic driver\n", | 1511 | "%s vs %s - removing generic driver\n", |
1512 | name, registered_fb[i]->fix.id); | 1512 | name, registered_fb[i]->fix.id); |
1513 | unregister_framebuffer(registered_fb[i]); | 1513 | unregister_framebuffer(registered_fb[i]); |