diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-11-22 13:06:44 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-11-22 13:06:44 -0500 |
| commit | 0bd2af46839ad6262d25714a6ec0365db9d6b98f (patch) | |
| tree | dcced72d230d69fd0c5816ac6dd03ab84799a93e /drivers/video/nvidia/nvidia.c | |
| parent | e138a5d2356729b8752e88520cc1525fae9794ac (diff) | |
| parent | f26b90440cd74c78fe10c9bd5160809704a9627c (diff) | |
Merge ../scsi-rc-fixes-2.6
Diffstat (limited to 'drivers/video/nvidia/nvidia.c')
| -rw-r--r-- | drivers/video/nvidia/nvidia.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/video/nvidia/nvidia.c b/drivers/video/nvidia/nvidia.c index eb24107bcc81..538e947610e1 100644 --- a/drivers/video/nvidia/nvidia.c +++ b/drivers/video/nvidia/nvidia.c | |||
| @@ -1160,20 +1160,20 @@ static u32 __devinit nvidia_get_arch(struct fb_info *info) | |||
| 1160 | case 0x0340: /* GeForceFX 5700 */ | 1160 | case 0x0340: /* GeForceFX 5700 */ |
| 1161 | arch = NV_ARCH_30; | 1161 | arch = NV_ARCH_30; |
| 1162 | break; | 1162 | break; |
| 1163 | case 0x0040: | 1163 | case 0x0040: /* GeForce 6800 */ |
| 1164 | case 0x00C0: | 1164 | case 0x00C0: /* GeForce 6800 */ |
| 1165 | case 0x0120: | 1165 | case 0x0120: /* GeForce 6800 */ |
| 1166 | case 0x0130: | 1166 | case 0x0130: |
| 1167 | case 0x0140: | 1167 | case 0x0140: /* GeForce 6600 */ |
| 1168 | case 0x0160: | 1168 | case 0x0160: /* GeForce 6200 */ |
| 1169 | case 0x01D0: | 1169 | case 0x01D0: /* GeForce 7200, 7300, 7400 */ |
| 1170 | case 0x0090: | 1170 | case 0x0090: /* GeForce 7800 */ |
| 1171 | case 0x0210: | 1171 | case 0x0210: /* GeForce 6800 */ |
| 1172 | case 0x0220: | 1172 | case 0x0220: /* GeForce 6200 */ |
| 1173 | case 0x0230: | 1173 | case 0x0230: |
| 1174 | case 0x0240: | 1174 | case 0x0240: /* GeForce 6100 */ |
| 1175 | case 0x0290: | 1175 | case 0x0290: /* GeForce 7900 */ |
| 1176 | case 0x0390: | 1176 | case 0x0390: /* GeForce 7600 */ |
| 1177 | arch = NV_ARCH_40; | 1177 | arch = NV_ARCH_40; |
| 1178 | break; | 1178 | break; |
| 1179 | case 0x0020: /* TNT, TNT2 */ | 1179 | case 0x0020: /* TNT, TNT2 */ |