diff options
| author | Alan Hourihane <alanh@fairlite.demon.co.uk> | 2007-05-18 13:48:56 +0100 |
|---|---|---|
| committer | Alan Hourihane <alanh@fairlite.demon.co.uk> | 2007-05-18 13:48:56 +0100 |
| commit | 315cf14af814da60285adb95238181de430c6f68 (patch) | |
| tree | 0474fc6591ffb1d4c76c3feb1f34df9ab6286eac /shared-core/nouveau_drm.h | |
| parent | 95945bbf226610ba4f41381fd0436722082397ec (diff) | |
| parent | ea98d7e79657469545b865a353784d79fc8cff9d (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
Conflicts:
shared-core/i915_dma.c
Diffstat (limited to 'shared-core/nouveau_drm.h')
| -rw-r--r-- | shared-core/nouveau_drm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/shared-core/nouveau_drm.h b/shared-core/nouveau_drm.h index 3ba7e961..1e7322e0 100644 --- a/shared-core/nouveau_drm.h +++ b/shared-core/nouveau_drm.h @@ -114,7 +114,7 @@ enum nouveau_card_type { NV_10 =10, NV_11 =10, NV_15 =10, - NV_17 =10, + NV_17 =17, NV_20 =20, NV_25 =20, NV_30 =30, |