summaryrefslogtreecommitdiff
path: root/src/nv_setup.c
diff options
context:
space:
mode:
authorAlexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>2004-03-17 20:30:51 +0000
committerAlexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>2004-03-17 20:30:51 +0000
commit06bbfeac0401f34ce08fb5eaafe4d8db83b8f7a5 (patch)
tree6552faaaf1026cc89bda9d6235a357e2868f7d22 /src/nv_setup.c
parentb56dd6bacff59e17249b5a1427f99edf93657f30 (diff)
merge with XORG-RELEASE-1 (tag XORG-CYGWIN-LAST-MERGE)YGWIN-6_8_1-MERGECYGWIN-RELEASE-1-MERGE
Diffstat (limited to 'src/nv_setup.c')
-rw-r--r--src/nv_setup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nv_setup.c b/src/nv_setup.c
index 8f84f8e..e399904 100644
--- a/src/nv_setup.c
+++ b/src/nv_setup.c
@@ -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) {