git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2255_FC5-vs2.0.2.2-rc9 patched with stable patch...
[linux-2.6.git]
/
drivers
/
video
/
nvidia
/
nvidia.c
diff --git
a/drivers/video/nvidia/nvidia.c
b/drivers/video/nvidia/nvidia.c
index
d4f8501
..
2a961f8
100644
(file)
--- a/
drivers/video/nvidia/nvidia.c
+++ b/
drivers/video/nvidia/nvidia.c
@@
-1145,20
+1145,20
@@
static u32 __devinit nvidia_get_arch(struct fb_info *info)
case 0x0340: /* GeForceFX 5700 */
arch = NV_ARCH_30;
break;
case 0x0340: /* GeForceFX 5700 */
arch = NV_ARCH_30;
break;
- case 0x0040:
- case 0x00C0:
- case 0x0120:
+ case 0x0040:
/* GeForce 6800 */
+ case 0x00C0:
/* GeForce 6800 */
+ case 0x0120:
/* GeForce 6800 */
case 0x0130:
case 0x0130:
- case 0x0140:
- case 0x0160:
- case 0x01D0:
- case 0x0090:
- case 0x0210:
- case 0x0220:
+ case 0x0140:
/* GeForce 6600 */
+ case 0x0160:
/* GeForce 6200 */
+ case 0x01D0:
/* GeForce 7200, 7300, 7400 */
+ case 0x0090:
/* GeForce 7800 */
+ case 0x0210:
/* GeForce 6800 */
+ case 0x0220:
/* GeForce 6200 */
case 0x0230:
case 0x0230:
- case 0x0240:
- case 0x0290:
- case 0x0390:
+ case 0x0240:
/* GeForce 6100 */
+ case 0x0290:
/* GeForce 7900 */
+ case 0x0390:
/* GeForce 7600 */
arch = NV_ARCH_40;
break;
case 0x0020: /* TNT, TNT2 */
arch = NV_ARCH_40;
break;
case 0x0020: /* TNT, TNT2 */