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/drm_pciids.txt | |
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/drm_pciids.txt')
-rw-r--r-- | shared-core/drm_pciids.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/shared-core/drm_pciids.txt b/shared-core/drm_pciids.txt index f090489f..ad67dda2 100644 --- a/shared-core/drm_pciids.txt +++ b/shared-core/drm_pciids.txt @@ -187,7 +187,6 @@ 0x1002 0x4c51 0 "3D Rage LT Pro" 0x1002 0x4c42 0 "3D Rage LT Pro AGP-133" 0x1002 0x4c44 0 "3D Rage LT Pro AGP-66" -0x1002 0x4759 0 "Rage 3D IICATI 3D RAGE IIC AGP(A12/A13)" 0x1002 0x474c 0 "Rage XC" 0x1002 0x474f 0 "Rage XL" 0x1002 0x4752 0 "Rage XL" |