diff options
| author | Dave Airlie <airlied@linux.ie> | 2006-01-02 03:44:23 +0000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2006-01-02 03:44:23 +0000 |
| commit | b2be72c44468f67e37e434a1e30b811963274f9c (patch) | |
| tree | 279320dd2369404e0f8a14d2d3845093dea9b678 /shared-core/sis_mm.c | |
| parent | fb91c500bfee9777421be5706e0a3b3e5049d6de (diff) | |
some fixes from linux kernel
Diffstat (limited to 'shared-core/sis_mm.c')
| -rw-r--r-- | shared-core/sis_mm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/shared-core/sis_mm.c b/shared-core/sis_mm.c index 0cab36ef..6d074d6f 100644 --- a/shared-core/sis_mm.c +++ b/shared-core/sis_mm.c @@ -90,7 +90,7 @@ static int sis_fb_alloc(DRM_IOCTL_ARGS) { drm_sis_mem_t fb; struct sis_memreq req; - drm_sis_mem_t __user *argp = (void __user *)data; + drm_sis_mem_t __user *argp = (drm_sis_mem_t __user *)data; int retval = 0; DRM_COPY_FROM_USER_IOCTL(fb, argp, sizeof(fb)); @@ -180,7 +180,7 @@ static int sis_fb_alloc(DRM_IOCTL_ARGS) { DRM_DEVICE; drm_sis_private_t *dev_priv = dev->dev_private; - drm_sis_mem_t __user *argp = (void __user *)data; + drm_sis_mem_t __user *argp = (drm_sis_mem_t __user *)data; drm_sis_mem_t fb; PMemBlock block; int retval = 0; |