diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2004-02-23 21:35:39 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2004-02-23 21:35:39 +0000 |
| commit | a13885d1155c944863c8c17f054105edde568330 (patch) | |
| tree | 6f68b81fb35c2b5481d71f46e99344e8cf53cefa /src/nv_setup.c | |
| parent | 9858a68808c586335b77c4afdd4d8526a71272ae (diff) | |
merge most of XFree86 RC3 (4.3.99.903) from vendor branch. bug #214XORG-RELEASE-1-BASEXEVIE-MERGEXINERAMA_2
Diffstat (limited to 'src/nv_setup.c')
| -rw-r--r-- | src/nv_setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nv_setup.c b/src/nv_setup.c index 8f84f8e..854146b 100644 --- a/src/nv_setup.c +++ b/src/nv_setup.c @@ -37,7 +37,7 @@ |* *| \***************************************************************************/ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_setup.c,v 1.39 2003/11/07 23:56:28 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_setup.c,v 1.40 2004/02/07 22:56:05 mvojkovi Exp $ */ #include "nv_include.h" @@ -292,7 +292,7 @@ static void nv10GetConfig (NVPtr pNv) } #endif - if((pNv->Chipset && 0xffff) == 0x01a0) { + if((pNv->Chipset & 0xffff) == 0x01a0) { int amt = pciReadLong(pciTag(0, 0, 1), 0x7C); pNv->RamAmountKBytes = (((amt >> 6) & 31) + 1) * 1024; } else if((pNv->Chipset & 0xffff) == 0x01f0) { |