diff options
| author | Adam Jackson <ajax@redhat.com> | 2008-11-23 20:14:15 -0500 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2008-11-23 20:14:15 -0500 |
| commit | 6cad0fa508db77a9ce45165a1cf870ee2f54ca3d (patch) | |
| tree | c1354f0747eca23838df3c6d36719e4d97d2c832 | |
| parent | 75e6c48a6f9f731ed6088e6f65db4697b89f9f85 (diff) | |
Use "no" bus, not ISA
| -rw-r--r-- | src/newport_driver.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/src/newport_driver.c b/src/newport_driver.c index 0bf0fe1..757fd12 100644 --- a/src/newport_driver.c +++ b/src/newport_driver.c @@ -1,6 +1,4 @@ /* - * Id: newport_driver.c,v 1.2 2000/11/29 20:58:10 agx Exp $ - * * Driver for the SGI Indy's Newport graphics card * * This driver is based on the newport.c & newport_con.c kernel code @@ -30,7 +28,6 @@ * Project. * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/newport/newport_driver.c,v 1.25 2003/04/23 21:51:41 tsi Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -272,17 +269,13 @@ NewportProbe(DriverPtr drv, int flags) int entity; ScrnInfoPtr pScrn = NULL; - /* This is a hack because don't have the RAC info(and don't want it). - * Set it as an ISA entity to get the entity field set up right. - */ - entity = xf86ClaimIsaSlot(drv, 0, dev, TRUE); + entity = xf86ClaimNoSlot(drv, 0, dev, TRUE); base = (NEWPORT_BASE_ADDR0 + busID * NEWPORT_BASE_OFFSET); RANGE(range[0], base, base + sizeof(NewportRegs),\ ResExcMemBlock); - pScrn = xf86ConfigIsaEntity(pScrn, 0, entity, NULL, range, \ - NULL, NULL, NULL, NULL); - /* Allocate a ScrnInfoRec */ + pScrn = xf86AllocateScreen(drv, 0); + xf86AddEntityToScreen(pScrn, entity); pScrn->driverVersion = NEWPORT_VERSION; pScrn->driverName = NEWPORT_DRIVER_NAME; pScrn->name = NEWPORT_NAME; |