Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6

[linux-2.6] / drivers / char / drm / sis_drv.c

diff --git a/drivers/char/drm/sis_drv.c b/drivers/char/drm/sis_drv.c
index 93880e4492014079b19c8cb1c809fa7df0c286f9..7dacc64e9b5685ca242936df97f71b50b287ca4c 100644 (file)
--- a/drivers/char/drm/sis_drv.c
+++ b/drivers/char/drm/sis_drv.c
@@ -35,14 +35,14 @@ static struct pci_device_id pciidlist[] = {
        sisdrv_PCI_IDS
 };
 
-static int sis_driver_load(drm_device_t *dev, unsigned long chipset)
+static int sis_driver_load(struct drm_device *dev, unsigned long chipset)
 {
        drm_sis_private_t *dev_priv;
        int ret;
 
        dev_priv = drm_calloc(1, sizeof(drm_sis_private_t), DRM_MEM_DRIVER);
        if (dev_priv == NULL)
-               return DRM_ERR(ENOMEM);
+               return -ENOMEM;
 
        dev->dev_private = (void *)dev_priv;
        dev_priv->chipset = chipset;
@@ -54,7 +54,7 @@ static int sis_driver_load(drm_device_t *dev, unsigned long chipset)
        return ret;
 }
 
-static int sis_driver_unload(drm_device_t *dev)
+static int sis_driver_unload(struct drm_device *dev)
 {
        drm_sis_private_t *dev_priv = dev->dev_private;
 
@@ -69,8 +69,9 @@ static struct drm_driver driver = {
        .load = sis_driver_load,
        .unload = sis_driver_unload,
        .context_dtor = NULL,
+       .dma_quiescent = sis_idle,
        .reclaim_buffers = NULL,
-       .reclaim_buffers_locked = sis_reclaim_buffers_locked,
+       .reclaim_buffers_idlelocked = sis_reclaim_buffers_locked,
        .lastclose = sis_lastclose,
        .get_map_ofs = drm_core_get_map_ofs,
        .get_reg_ofs = drm_core_get_reg_ofs,