diff options
| author | George Sapountzis <gsap7@yahoo.gr> | 2007-03-23 22:12:48 +0200 |
|---|---|---|
| committer | George Sapountzis <gsap7@yahoo.gr> | 2007-03-23 23:27:39 +0200 |
| commit | 9cd175d9cd4ed710fccb303664c77519ecaf1e21 (patch) | |
| tree | 26cd672168c945ff6b325ac8f81a361105026cb3 /src/r128_probe.c | |
| parent | d7a8cd0e476034796fc38e25a28cd28d05ea4a13 (diff) | |
Fold FillIn() back to Probe().
Diffstat (limited to 'src/r128_probe.c')
| -rw-r--r-- | src/r128_probe.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/r128_probe.c b/src/r128_probe.c index 836f1d07..81ff663a 100644 --- a/src/r128_probe.c +++ b/src/r128_probe.c @@ -41,7 +41,6 @@ * Modified by Marc Aurele La France <tsi@xfree86.org> for ATI driver merge. */ -#include "atimodule.h" #include "ativersion.h" #include "r128_probe.h" @@ -194,8 +193,18 @@ R128Probe(DriverPtr drv, int flags) if((pScrn = xf86ConfigPciEntity(pScrn, 0, usedChips[i], R128PciChipsets, 0, 0, 0, 0, 0))) { + pScrn->driverVersion = R128_VERSION_CURRENT; + pScrn->driverName = R128_DRIVER_NAME; + pScrn->name = R128_NAME; pScrn->Probe = R128Probe; - R128FillInScreenInfo(pScrn); + pScrn->PreInit = R128PreInit; + pScrn->ScreenInit = R128ScreenInit; + pScrn->SwitchMode = R128SwitchMode; + pScrn->AdjustFrame = R128AdjustFrame; + pScrn->EnterVT = R128EnterVT; + pScrn->LeaveVT = R128LeaveVT; + pScrn->FreeScreen = R128FreeScreen; + pScrn->ValidMode = R128ValidMode; foundScreen = TRUE; |