diff --git a/[refs] b/[refs] index d1e3919a357a..78ee6d19ebc7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a871869245d79ab8d8ee465139144c7cb89e1854 +refs/heads/master: 3760c621fd2c0cf4185c3e2a0817c3e95d9cff48 diff --git a/trunk/drivers/staging/msm/staging-devices.c b/trunk/drivers/staging/msm/staging-devices.c index 861f33072314..d6cd919469dd 100644 --- a/trunk/drivers/staging/msm/staging-devices.c +++ b/trunk/drivers/staging/msm/staging-devices.c @@ -166,7 +166,7 @@ static void __init qsd8x50_allocate_memory_regions(void) msm_fb_resources[0].start = __pa(addr); msm_fb_resources[0].end = msm_fb_resources[0].start + size - 1; - pr_info(KERN_ERR "using %lu bytes of SMI at %lx physical for fb\n", + pr_info("using %lu bytes of SMI at %lx physical for fb\n", size, (unsigned long)addr); }