[PATCH] parport: Kconfig dependency fixes

[safe/jmp/linux-2.6] / drivers / char / drm / radeon_cp.c

diff --git a/drivers/char/drm/radeon_cp.c b/drivers/char/drm/radeon_cp.c
index b517ae5..342302d 100644 (file)
--- a/drivers/char/drm/radeon_cp.c
+++ b/drivers/char/drm/radeon_cp.c
@@ -1312,8 +1312,6 @@ static void radeon_set_pcigart(drm_radeon_private_t * dev_priv, int on)
 static int radeon_do_init_cp(drm_device_t * dev, drm_radeon_init_t * init)
 {
        drm_radeon_private_t *dev_priv = dev->dev_private;
-       unsigned int mem_size, aper_size;
-
        DRM_DEBUG("\n");
 
        dev_priv->is_pci = init->is_pci;
@@ -1523,13 +1521,8 @@ static int radeon_do_init_cp(drm_device_t * dev, drm_radeon_init_t * init)
                                          + dev_priv->fb_location) >> 10));
 
        dev_priv->gart_size = init->gart_size;
-
-       mem_size = RADEON_READ(RADEON_CONFIG_MEMSIZE);
-       if (mem_size == 0)
-               mem_size = 0x800000;
-       aper_size = max(RADEON_READ(RADEON_CONFIG_APER_SIZE), mem_size);
-
-       dev_priv->gart_vm_start = dev_priv->fb_location + aper_size;
+       dev_priv->gart_vm_start = dev_priv->fb_location
+           + RADEON_READ(RADEON_CONFIG_APER_SIZE);
 
 #if __OS_HAS_AGP
        if (!dev_priv->is_pci)