projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge 3.4-rc5 into staging-next
[deliverable/linux.git]
/
drivers
/
staging
/
xgifb
/
vb_init.c
diff --git
a/drivers/staging/xgifb/vb_init.c
b/drivers/staging/xgifb/vb_init.c
index 0c2c0176fb1d480794b120a7913c4a2f41a6b72f..c222d611431d5cdbde463e41d0ffd47e1c7b28c1 100644
(file)
--- a/
drivers/staging/xgifb/vb_init.c
+++ b/
drivers/staging/xgifb/vb_init.c
@@
-61,7
+61,7
@@
XGINew_GetXG20DRAMType(struct xgi_hw_device_info *HwDeviceExtension,
}
temp = xgifb_reg_get(pVBInfo->P3c4, 0x3B);
/* SR3B[7][3]MAA15 MAA11 (Power on Trapping) */
- if ((
temp & 0x88) == 0x80
)
+ if ((
(temp & 0x88) == 0x80) || ((temp & 0x88) == 0x08)
)
data = 0; /* DDR */
else
data = 1; /* DDRII */
This page took
0.067005 seconds
and
5
git commands to generate.