diff options
| author | Jesse Barnes <jbarnes@hobbes.virtuousgeek.org> | 2007-05-18 09:42:51 -0700 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@hobbes.virtuousgeek.org> | 2007-05-18 09:42:51 -0700 |
| commit | a4929b921e44dcd3cae8e384b9b7eabc51db28ff (patch) | |
| tree | 876a2ba492fd2786ed44ff26c514a0f2951f9096 /shared-core/nouveau_drm.h | |
| parent | f89458722173b364b8c3c27788b6c61889da554c (diff) | |
| parent | d42c1de3fb05405820b03ec9bb12f0b9a7eb0a7b (diff) | |
Merge branch 'modesetting-101' of git+ssh://git.freedesktop.org/git/mesa/drm into origin/modesetting-101
Conflicts:
linux-core/drm_crtc.c - reconcile with locking changes
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, |