diff options
| author | Ian Romanick <idr@umwelt.(none)> | 2006-07-26 11:47:32 -0700 |
|---|---|---|
| committer | Ian Romanick <idr@umwelt.(none)> | 2006-07-26 11:47:32 -0700 |
| commit | 068e3427cfdf3e3b5dc5c97872d5f52f47ff0d68 (patch) | |
| tree | 18f8df572970303b4983303cd5d7407ac6c218e1 /src | |
| parent | 95e0722ff2e8878cdd6bb0e349eecab042b879db (diff) | |
| parent | 7170de83762660efebff79be84f763008466ffa7 (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-mga into pci-rework
Diffstat (limited to 'src')
| -rw-r--r-- | src/.cvsignore | 6 | ||||
| -rw-r--r-- | src/mga_dri.c | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/src/.cvsignore b/src/.cvsignore deleted file mode 100644 index 9730646..0000000 --- a/src/.cvsignore +++ /dev/null @@ -1,6 +0,0 @@ -.deps -.libs -Makefile -Makefile.in -*.la -*.lo diff --git a/src/mga_dri.c b/src/mga_dri.c index b099c7d..87b02d8 100644 --- a/src/mga_dri.c +++ b/src/mga_dri.c @@ -1012,7 +1012,7 @@ Bool MGADRIScreenInit( ScreenPtr pScreen ) pDRIInfo->ddxDriverMajorVersion = MGA_MAJOR_VERSION; pDRIInfo->ddxDriverMinorVersion = MGA_MINOR_VERSION; pDRIInfo->ddxDriverPatchVersion = MGA_PATCHLEVEL; - pDRIInfo->frameBufferPhysicalAddress = pMga->FbAddress; + pDRIInfo->frameBufferPhysicalAddress = (void *) pMga->FbAddress; pDRIInfo->frameBufferSize = pMga->FbMapSize; pDRIInfo->frameBufferStride = pScrn->displayWidth*(pScrn->bitsPerPixel/8); pDRIInfo->ddxDrawableTableEntry = MGA_MAX_DRAWABLES; |