diff options
| author | Eric Anholt <anholt@freebsd.org> | 2004-06-16 09:23:29 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@freebsd.org> | 2004-06-16 09:23:29 +0000 |
| commit | b9a6776bc04eb19343882bddb371b705677cfc14 (patch) | |
| tree | 1a208639fce2ff133b157bf41ad8217f1d1035f2 /src/nv_setup.c | |
| parent | cbf040deb0ab24425468ed60b3f3edd322ec210f (diff) | |
DRI XFree86-4_3_99_12-merge importDRI-trunk-20040721DRI-trunk-20040613DRI-XFree86-4_3_99_12-mergeCOMPOSITEWRAP
Diffstat (limited to 'src/nv_setup.c')
| -rw-r--r-- | src/nv_setup.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/nv_setup.c b/src/nv_setup.c index e399904..3d58efa 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.38 2003/09/08 20:00:27 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) { @@ -403,7 +403,6 @@ NVCommonSetup(ScrnInfoPtr pScrn) case 0x017D: case 0x0186: case 0x0187: - case 0x0189: case 0x0286: case 0x028C: case 0x0316: |