Merge branch 'master' into master

This commit is contained in:
F10
2020-10-16 08:58:02 +03:00
committed by GitHub
4 changed files with 33 additions and 24 deletions

View File

@@ -2581,7 +2581,6 @@ static uint8_t
s3_accel_in(uint16_t port, void *p)
{
s3_t *s3 = (s3_t *)p;
svga_t *svga = &s3->svga;
int temp;
if (!s3->enable_8514)