On 12/02/14 23:02, Adam Jackson wrote:
> Calling this "conflicting" just makes people think there's a problem
> when there's not.
>
> Signed-off-by: Adam Jackson <ajax@xxxxxxxxxx>
> ---
> 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 7309ac7..b6d5008 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)
>
Thanks, queued for 3.15.
Tomi
Attachment:
signature.asc
Description: OpenPGP digital signature
