From 2e57f75dbb80b1a0138a1ef60f302258f62dbeec Mon Sep 17 00:00:00 2001
From: Marek Belisko <marek.belisko@open-nandra.com>
Date: Thu, 3 Mar 2011 12:38:17 +0000
Subject: [PATCH] --- yaml --- r: 236273 b: refs/heads/master c:
 bc54f3393c0563a00c13d2b58aca23ae153bdd3b h: refs/heads/master i:   236271:
 3aa2ef6406abe54e706baff5110515a05c200a03 v: v3

---
 [refs]                                 |  2 +-
 trunk/drivers/staging/gma500/psb_drv.c | 27 +++++++++++++-------------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index fdc7b4c83532..e46affcbb3e1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 487e873dd3f8d7ede7635896e19376ef78157721
+refs/heads/master: bc54f3393c0563a00c13d2b58aca23ae153bdd3b
diff --git a/trunk/drivers/staging/gma500/psb_drv.c b/trunk/drivers/staging/gma500/psb_drv.c
index 090d9a2e60bf..44cd095d2862 100644
--- a/trunk/drivers/staging/gma500/psb_drv.c
+++ b/trunk/drivers/staging/gma500/psb_drv.c
@@ -1601,17 +1601,6 @@ static struct drm_driver driver = {
 		 .fasync = drm_fasync,
 		 .read = drm_read,
 		 },
-	.pci_driver = {
-		       .name = DRIVER_NAME,
-		       .id_table = pciidlist,
-		       .resume = ospm_power_resume,
-		       .suspend = ospm_power_suspend,
-		       .probe = psb_probe,
-		       .remove = psb_remove,
-#ifdef CONFIG_PM
-			.driver.pm = &psb_pm_ops,
-#endif
-		       },
 	.name = DRIVER_NAME,
 	.desc = DRIVER_DESC,
 	.date = PSB_DRM_DRIVER_DATE,
@@ -1620,6 +1609,18 @@ static struct drm_driver driver = {
 	.patchlevel = PSB_DRM_DRIVER_PATCHLEVEL
 };
 
+static struct pci_driver psb_pci_driver = {
+	.name = DRIVER_NAME,
+	.id_table = pciidlist,
+	.resume = ospm_power_resume,
+	.suspend = ospm_power_suspend,
+	.probe = psb_probe,
+	.remove = psb_remove,
+#ifdef CONFIG_PM
+	.driver.pm = &psb_pm_ops,
+#endif
+};
+
 static int psb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
 	/* MLD Added this from Inaky's patch */
@@ -1630,12 +1631,12 @@ static int psb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
 static int __init psb_init(void)
 {
-	return drm_init(&driver);
+	return drm_pci_init(&driver, &psb_pci_driver);
 }
 
 static void __exit psb_exit(void)
 {
-	drm_exit(&driver);
+	drm_pci_exit(&driver, &psb_pci_driver);
 }
 
 late_initcall(psb_init);