diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2004-02-23 20:35:04 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2004-02-23 20:35:04 +0000 |
| commit | d176fa338d2d83bcf8d7ec68ff1aec205a258fec (patch) | |
| tree | 05f93e7a5053c662d4a5bb9b72fbb0249bfd8e64 /src | |
| parent | ea7a90e680a2e9259e471dd6677bcca12aeea79e (diff) | |
Import most of XFree86 4.4RC3. This import excludes files which have thexf86-4_3_99_903_special
new license. If we want to, later we can import 4.4RC3 again and pick
up the files that have the new license, but for now the vendor branch
is "pure."
Diffstat (limited to 'src')
| -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) { |