diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2007-07-12 11:28:58 +1000 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2007-07-12 11:28:58 +1000 |
| commit | c91dfdf329f946c8cc581f079359092629cf73dc (patch) | |
| tree | 26f2abbee7a2ab96ab4f68d79ed168b78d0643f1 /src/nv_dri.c | |
| parent | e6a16710033d189aa5d6b2e3b4a75f2dd9d05a5d (diff) | |
| parent | 4cbd3a1d9dfe6d51648de36ce7ae3d02c920374e (diff) | |
| download | xorg-driver-xf86-video-nouveau-c91dfdf329f946c8cc581f079359092629cf73dc.tar.gz | |
Merge branch 'randr-1.2' into nv50-branchnv50-branch
Conflicts:
src/nv_driver.c
Diffstat (limited to 'src/nv_dri.c')
| -rw-r--r-- | src/nv_dri.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nv_dri.c b/src/nv_dri.c index a489e68..772f5fc 100644 --- a/src/nv_dri.c +++ b/src/nv_dri.c @@ -244,7 +244,7 @@ Bool NVDRIGetVersion(ScrnInfoPtr pScrn) } /* temporary lock step versioning */ -#if NOUVEAU_DRM_HEADER_PATCHLEVEL != 7 +#if NOUVEAU_DRM_HEADER_PATCHLEVEL != 9 #error nouveau_drm.h doesn't match expected patchlevel, update libdrm. #endif if (pNv->pKernelDRMVersion->version_patchlevel != |