diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-31 10:03:19 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-31 10:03:19 -0500 |
| commit | ea19006f583b2128ce8338e6bb43aa0eb724a4b9 (patch) | |
| tree | 4c859976b6acc1301d2c8822be6f21b0381f45fc /drivers/char/drm/sis_mm.c | |
| parent | 8b316a3973f05e572b4edeeda9072987f6bbaa44 (diff) | |
| parent | a0f067802576d4eb4c65d40b8ee7d6ea3c81dd61 (diff) | |
| download | op-kernel-dev-ea19006f583b2128ce8338e6bb43aa0eb724a4b9.zip op-kernel-dev-ea19006f583b2128ce8338e6bb43aa0eb724a4b9.tar.gz | |
Merge branch 'master'
Diffstat (limited to 'drivers/char/drm/sis_mm.c')
| -rw-r--r-- | drivers/char/drm/sis_mm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/drm/sis_mm.c b/drivers/char/drm/sis_mm.c index 6774d2f..5e9936bc 100644 --- a/drivers/char/drm/sis_mm.c +++ b/drivers/char/drm/sis_mm.c @@ -110,7 +110,7 @@ static int sis_fb_alloc(DRM_IOCTL_ARGS) DRM_COPY_TO_USER_IOCTL(argp, fb, sizeof(fb)); - DRM_DEBUG("alloc fb, size = %d, offset = %ld\n", fb.size, req.offset); + DRM_DEBUG("alloc fb, size = %d, offset = %d\n", fb.size, req.offset); return retval; } |
