Merge branch 'stable/ttm.pci-api.v5' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / drivers / gpu / drm / vmwgfx / vmwgfx_drv.c

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
index 4a8c789..df04661 100644 (file)
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
@@ -909,15 +909,6 @@ static struct drm_driver driver = {
 #endif
                 .llseek = noop_llseek,
        },
-       .pci_driver = {
-                .name = VMWGFX_DRIVER_NAME,
-                .id_table = vmw_pci_id_list,
-                .probe = vmw_probe,
-                .remove = vmw_remove,
-                .driver = {
-                        .pm = &vmw_pm_ops
-                }
-        },
        .name = VMWGFX_DRIVER_NAME,
        .desc = VMWGFX_DRIVER_DESC,
        .date = VMWGFX_DRIVER_DATE,
@@ -926,6 +917,16 @@ static struct drm_driver driver = {
        .patchlevel = VMWGFX_DRIVER_PATCHLEVEL
 };
 
+static struct pci_driver vmw_pci_driver = {
+       .name = VMWGFX_DRIVER_NAME,
+       .id_table = vmw_pci_id_list,
+       .probe = vmw_probe,
+       .remove = vmw_remove,
+       .driver = {
+               .pm = &vmw_pm_ops
+       }
+};
+
 static int vmw_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
        return drm_get_pci_dev(pdev, ent, &driver);
@@ -934,7 +935,7 @@ static int vmw_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 static int __init vmwgfx_init(void)
 {
        int ret;
-       ret = drm_init(&driver);
+       ret = drm_pci_init(&driver, &vmw_pci_driver);
        if (ret)
                DRM_ERROR("Failed initializing DRM.\n");
        return ret;
@@ -942,7 +943,7 @@ static int __init vmwgfx_init(void)
 
 static void __exit vmwgfx_exit(void)
 {
-       drm_exit(&driver);
+       drm_pci_exit(&driver, &vmw_pci_driver);
 }
 
 module_init(vmwgfx_init);