From acd468b14d883439f09fe7204c1566d55fcedc8e Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Thu, 21 Jun 2012 11:58:23 +0100 Subject: [PATCH] --- yaml --- r: 318561 b: refs/heads/master c: 7c0143341a5b457eecf2490ab823a19e98ec082f h: refs/heads/master i: 318559: 5e1fefb97d4c20e5ec387e171d747f688a126a6f v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/drm_drv.c | 2 +- trunk/drivers/gpu/drm/drm_info.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a27fe3d43a76..b1a82da180f2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 36ff39c4045ee71cd306f8af5f8c2a1c6e998eba +refs/heads/master: 7c0143341a5b457eecf2490ab823a19e98ec082f diff --git a/trunk/drivers/gpu/drm/drm_drv.c b/trunk/drivers/gpu/drm/drm_drv.c index 8a9d0792e4ec..946bd91c57ec 100644 --- a/trunk/drivers/gpu/drm/drm_drv.c +++ b/trunk/drivers/gpu/drm/drm_drv.c @@ -486,7 +486,7 @@ long drm_ioctl(struct file *filp, kfree(kdata); atomic_dec(&dev->ioctl_count); if (retcode) - DRM_DEBUG("ret = %x\n", retcode); + DRM_DEBUG("ret = %d\n", retcode); return retcode; } diff --git a/trunk/drivers/gpu/drm/drm_info.c b/trunk/drivers/gpu/drm/drm_info.c index ab1162da70f8..4076a33e5cad 100644 --- a/trunk/drivers/gpu/drm/drm_info.c +++ b/trunk/drivers/gpu/drm/drm_info.c @@ -235,7 +235,7 @@ int drm_clients_info(struct seq_file *m, void *data) } -int drm_gem_one_name_info(int id, void *ptr, void *data) +static int drm_gem_one_name_info(int id, void *ptr, void *data) { struct drm_gem_object *obj = ptr; struct seq_file *m = data;