diff --git a/[refs] b/[refs] index 2d6b13886704..6ad2e12b1be4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3fffdf2045d0dbca3833f8f54ae41ce5f2c0b8fa +refs/heads/master: 6cbfa62589d71500d8097fd33e8f9958d484b071 diff --git a/trunk/drivers/staging/memrar/memrar_handler.c b/trunk/drivers/staging/memrar/memrar_handler.c index 4bbf66f4223d..3e0dfe365769 100644 --- a/trunk/drivers/staging/memrar/memrar_handler.c +++ b/trunk/drivers/staging/memrar/memrar_handler.c @@ -390,7 +390,7 @@ static int memrar_init_rar_resources(char const *devname) (unsigned long) low, (unsigned long) high); - pr_info("%s: BRAR[%d] size = %u KiB\n", + pr_info("%s: BRAR[%d] size = %zu KiB\n", devname, z, rar->allocator->capacity / 1024);