diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-05 14:38:55 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-05 14:38:55 -0500 |
commit | 328198acb7407301ddf6005c0fa1e04bd0c539c8 (patch) | |
tree | 9936112bd195bfbaacc9a75f2ea7ff757a2c0546 /drivers/char/drm/via_map.c | |
parent | 9e0cb06b17be7e562cbdaba2768649f025826dc6 (diff) | |
parent | fecb4a0c87c2bcaee1f3cf800126eef752a07ed3 (diff) | |
download | op-kernel-dev-328198acb7407301ddf6005c0fa1e04bd0c539c8.zip op-kernel-dev-328198acb7407301ddf6005c0fa1e04bd0c539c8.tar.gz |
Merge branch 'master'
Diffstat (limited to 'drivers/char/drm/via_map.c')
-rw-r--r-- | drivers/char/drm/via_map.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/char/drm/via_map.c b/drivers/char/drm/via_map.c index bb17113..6bd6ac5 100644 --- a/drivers/char/drm/via_map.c +++ b/drivers/char/drm/via_map.c @@ -66,7 +66,7 @@ static int via_do_init_map(drm_device_t * dev, drm_via_init_t * init) dev_priv->agpAddr = init->agpAddr; - via_init_futex( dev_priv ); + via_init_futex(dev_priv); dev_priv->pro_group_a = (dev->pdev->device == 0x3118); dev->dev_private = (void *)dev_priv; @@ -107,5 +107,3 @@ int via_map_init(DRM_IOCTL_ARGS) return -EINVAL; } - - |