diff options
| author | Kristian Høgsberg <krh@redhat.com> | 2007-10-12 19:35:04 -0400 |
|---|---|---|
| committer | Kristian Høgsberg <krh@redhat.com> | 2007-10-12 19:35:04 -0400 |
| commit | f9c6dfc4d12451c21f39f38b048758cbee5723cf (patch) | |
| tree | 5384315d9ec06a779137c63b54d6326dbc12ef81 /src/mesa/drivers/dri/r300 | |
| parent | bf805d3bf5bf191aa669b6155316a78917cf9b0e (diff) | |
| parent | a2494462cb7d557a7643452c720e0ab8fa9f4f63 (diff) | |
Merge branch 'dri2'
Conflicts:
src/mesa/drivers/dri/i915/intel_screen.c
Diffstat (limited to 'src/mesa/drivers/dri/r300')
| -rw-r--r-- | src/mesa/drivers/dri/r300/radeon_context.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/r300/radeon_context.c b/src/mesa/drivers/dri/r300/radeon_context.c index e9634b427a..6dfaf3c647 100644 --- a/src/mesa/drivers/dri/r300/radeon_context.c +++ b/src/mesa/drivers/dri/r300/radeon_context.c @@ -156,7 +156,7 @@ GLboolean radeonInitContext(radeonContextPtr radeon, radeon->dri.hwContext = driContextPriv->hHWContext; radeon->dri.hwLock = &sPriv->pSAREA->lock; radeon->dri.fd = sPriv->fd; - radeon->dri.drmMinor = sPriv->drmMinor; + radeon->dri.drmMinor = sPriv->drm_version.minor; radeon->radeonScreen = screen; radeon->sarea = (drm_radeon_sarea_t *) ((GLubyte *) sPriv->pSAREA + |