diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2011-10-26 22:22:59 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2011-12-22 00:33:23 +0100 |
| commit | be2fb9da32cb88a1311350de3d1db8f9e461ae9f (patch) | |
| tree | a261a7a230e7055ed41e5037b1cb1ac3ca9dd908 /drivers/gpu/drm/sis/sis_drv.c | |
| parent | 977b4f6edd7a960dd80c1a614a7644068f866c5b (diff) | |
| download | linux-be2fb9da32cb88a1311350de3d1db8f9e461ae9f.tar.gz linux-be2fb9da32cb88a1311350de3d1db8f9e461ae9f.tar.bz2 linux-be2fb9da32cb88a1311350de3d1db8f9e461ae9f.zip | |
drm/sis: use drm_mm instead of drm_sman
v2: Smash compile fix from Tormod Volden <debian.tormod@gmail.com> for
CONFIG_FB_SIS on top of this.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/sis/sis_drv.c')
| -rw-r--r-- | drivers/gpu/drm/sis/sis_drv.c | 4 |
1 files changed, 0 insertions, 4 deletions
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); |