diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 10:29:00 +0100 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 10:29:00 +0100 |
commit | 9caafa6c8686e319cf4d5f3757b3972c6c522b7c (patch) | |
tree | b38979b835b5d22e681b175d0b98a3c7560d9c59 /drivers/char/drm/radeon_cp.c | |
parent | [libata sata_sil] implement 'slow_down' module parameter (diff) | |
parent | Merge branch 'master' (diff) | |
download | linux-9caafa6c8686e319cf4d5f3757b3972c6c522b7c.tar.xz linux-9caafa6c8686e319cf4d5f3757b3972c6c522b7c.zip |
Merge branch 'upstream-fixes'
Diffstat (limited to 'drivers/char/drm/radeon_cp.c')
-rw-r--r-- | drivers/char/drm/radeon_cp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/drm/radeon_cp.c b/drivers/char/drm/radeon_cp.c index 915665c7fe7c..9bb8ae0c1c27 100644 --- a/drivers/char/drm/radeon_cp.c +++ b/drivers/char/drm/radeon_cp.c @@ -1640,7 +1640,7 @@ static int radeon_do_cleanup_cp(drm_device_t * dev) if (dev_priv->gart_info.gart_table_location == DRM_ATI_GART_FB) { drm_core_ioremapfree(&dev_priv->gart_info.mapping, dev); - dev_priv->gart_info.addr = 0; + dev_priv->gart_info.addr = NULL; } } /* only clear to the start of flags */ |