[PATCH] Fixup to work with RAC removal.

[Tiago Vignatti]

Signed-off-by: Tiago Vignatti <tiago.vignatti at nokia.com>
---
 src/smi_driver.c |   26 +++++++++++---------------
 1 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/src/smi_driver.c b/src/smi_driver.c
index b9b7b18..eb6c961 100644
--- a/src/smi_driver.c
+++ b/src/smi_driver.c
@@ -31,8 +31,6 @@ authorization from The XFree86 Project or Silicon Motion.
 #include "config.h"
 #endif
 
-#include "xf86Resources.h"
-#include "xf86RAC.h"
 #include "xf86DDC.h"
 #include "xf86int10.h"
 #include "vbe.h"
@@ -138,15 +136,15 @@ static SymTabRec SMIChipsets[] =
 static PciChipsets SMIPciChipsets[] =
 {
     /* numChipset,	PciID,			Resource */
-    { PCI_CHIP_SMI910,	PCI_CHIP_SMI910,	RES_SHARED_VGA },
-    { PCI_CHIP_SMI810,	PCI_CHIP_SMI810,	RES_SHARED_VGA },
-    { PCI_CHIP_SMI820,	PCI_CHIP_SMI820,	RES_SHARED_VGA },
-    { PCI_CHIP_SMI710,	PCI_CHIP_SMI710,	RES_SHARED_VGA },
-    { PCI_CHIP_SMI712,	PCI_CHIP_SMI712,	RES_SHARED_VGA },
-    { PCI_CHIP_SMI720,	PCI_CHIP_SMI720,	RES_SHARED_VGA },
-    { PCI_CHIP_SMI731,	PCI_CHIP_SMI731,	RES_SHARED_VGA },
-    { PCI_CHIP_SMI501,	PCI_CHIP_SMI501,	RES_UNDEFINED  },
-    { -1,		-1,			RES_UNDEFINED  }
+    { PCI_CHIP_SMI910,	PCI_CHIP_SMI910},
+    { PCI_CHIP_SMI810,	PCI_CHIP_SMI810},
+    { PCI_CHIP_SMI820,	PCI_CHIP_SMI820},
+    { PCI_CHIP_SMI710,	PCI_CHIP_SMI710},
+    { PCI_CHIP_SMI712,	PCI_CHIP_SMI712},
+    { PCI_CHIP_SMI720,	PCI_CHIP_SMI720},
+    { PCI_CHIP_SMI731,	PCI_CHIP_SMI731},
+    { PCI_CHIP_SMI501,	PCI_CHIP_SMI501},
+    { -1,		-1}
 };
 
 typedef enum
@@ -346,8 +344,7 @@ SMI_Probe(DriverPtr drv, int flags)
 
 	for (i = 0; i < numUsed; i++) {
 	    if ((pScrn = xf86ConfigPciEntity(NULL, 0, usedChips[i],
-					     SMIPciChipsets, NULL,
-					     NULL, NULL, NULL, NULL))) {
+					     SMIPciChipsets, NULL, NULL, NULL, NULL))) {
 		pScrn->driverVersion = SILICONMOTION_DRIVER_VERSION;
 		pScrn->driverName    = SILICONMOTION_DRIVER_NAME;
 		pScrn->name	     = SILICONMOTION_NAME;
@@ -416,7 +413,7 @@ SMI_PreInit(ScrnInfoPtr pScrn, int flags)
 	LEAVE(TRUE);
     }
 
-    if (pEnt->location.type != BUS_PCI || pEnt->resources) {
+    if (pEnt->location.type != BUS_PCI) {
 	xfree(pEnt);
 	SMI_FreeRec(pScrn);
 	LEAVE(FALSE);
@@ -626,7 +623,6 @@ SMI_PreInit(ScrnInfoPtr pScrn, int flags)
 	}
     }
 
-    xf86RegisterResources(pEnt->index, NULL, ResExclusive);
 /*  xf86SetOperatingState(resVgaIo, pEnt->index, ResUnusedOpr); */
 /*  xf86SetOperatingState(resVgaMem, pEnt->index, ResDisableOpr); */
 
-- 
1.5.6.3


--LQksG6bCIzRHxTLp--