diff options
| author | Alex Deucher <alex@samba.(none)> | 2007-12-12 22:37:44 -0500 |
|---|---|---|
| committer | Alex Deucher <alex@samba.(none)> | 2007-12-12 22:37:44 -0500 |
| commit | f5ac34983411e4c4f41ab1817dce582830f398fd (patch) | |
| tree | 4d2c47513ae6893ff7ea928704718356eb3824cd /src/r128_probe.c | |
| parent | f2b2e0804183b52d9d3f56ad85b3552ece76c544 (diff) | |
| parent | 6ccf5b33d27218ae1c45ab93c122438ed536d8ba (diff) | |
Merge branch 'master' of git+ssh://agd5f@git.freedesktop.org/git/xorg/driver/xf86-video-ati into atombios-support
merge and fix conflicts
Diffstat (limited to 'src/r128_probe.c')
| -rw-r--r-- | src/r128_probe.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/r128_probe.c b/src/r128_probe.c index b2298dff..0be21e8a 100644 --- a/src/r128_probe.c +++ b/src/r128_probe.c @@ -193,7 +193,7 @@ R128Probe(DriverPtr drv, int flags) pScrn = NULL; if((pScrn = xf86ConfigPciEntity(pScrn, 0, usedChips[i], - R128PciChipsets, 0, 0, 0, 0, 0))) + R128PciChipsets, NULL, NULL, NULL, NULL, NULL))) { pScrn->driverVersion = R128_VERSION_CURRENT; pScrn->driverName = R128_DRIVER_NAME; |