From be2fb9da32cb88a1311350de3d1db8f9e461ae9f Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Wed, 26 Oct 2011 22:22:59 +0200 Subject: drm/sis: use drm_mm instead of drm_sman v2: Smash compile fix from Tormod Volden for CONFIG_FB_SIS on top of this. Signed-off-by: Daniel Vetter --- drivers/gpu/drm/sis/sis_drv.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'drivers/gpu/drm/sis/sis_drv.c') diff --git a/drivers/gpu/drm/sis/sis_drv.c b/drivers/gpu/drm/sis/sis_drv.c index 64d329f7d9b6..06da063ece2e 100644 --- a/drivers/gpu/drm/sis/sis_drv.c +++ b/drivers/gpu/drm/sis/sis_drv.c @@ -49,9 +49,6 @@ static int sis_driver_load(struct drm_device *dev, unsigned long chipset) dev->dev_private = (void *)dev_priv; dev_priv->chipset = chipset; idr_init(&dev->object_name_idr); - ret = drm_sman_init(&dev_priv->sman, 2, 12, 8); - if (ret) - kfree(dev_priv); return ret; } @@ -60,7 +57,6 @@ static int sis_driver_unload(struct drm_device *dev) { drm_sis_private_t *dev_priv = dev->dev_private; - drm_sman_takedown(&dev_priv->sman); idr_remove_all(&dev_priv->object_idr); idr_destroy(&dev_priv->object_idr); -- cgit v1.2.3