diff for duplicates of <4EF25322.1000408@gmx.de> diff --git a/a/1.txt b/N1/1.txt index b9291eb..576958d 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -21,7 +21,7 @@ Florian Tobias Schandinat > --- linux-3.1-orig/drivers/video/s3fb.c 2011-10-24 09:10:05.000000000 +0200 > +++ linux-3.1/drivers/video/s3fb.c 2011-12-19 23:28:34.000000000 +0100 > @@ -727,7 +727,7 @@ -> if (par->chip = CHIP_988_VIRGE_VX) { +> if (par->chip == CHIP_988_VIRGE_VX) { > vga_wcrt(par->state.vgabase, 0x50, 0x00); > vga_wcrt(par->state.vgabase, 0x67, 0x50); > - @@ -43,7 +43,7 @@ Florian Tobias Schandinat > info->screen_size = 2 << 20; > break; > } -> + } else if (par->chip = CHIP_988_VIRGE_VX) { +> + } else if (par->chip == CHIP_988_VIRGE_VX) { > + switch ((regval & 0x60) >> 5) { > + case 0: /* 2MB */ > + info->screen_size = 2 << 20; diff --git a/a/content_digest b/N1/content_digest index b1d9d64..5fd4a70 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -32,7 +32,7 @@ "> --- linux-3.1-orig/drivers/video/s3fb.c\t2011-10-24 09:10:05.000000000 +0200\n" "> +++ linux-3.1/drivers/video/s3fb.c\t2011-12-19 23:28:34.000000000 +0100\n" "> @@ -727,7 +727,7 @@\n" - "> \tif (par->chip = CHIP_988_VIRGE_VX) {\n" + "> \tif (par->chip == CHIP_988_VIRGE_VX) {\n" "> \t\tvga_wcrt(par->state.vgabase, 0x50, 0x00);\n" "> \t\tvga_wcrt(par->state.vgabase, 0x67, 0x50);\n" "> -\n" @@ -54,7 +54,7 @@ "> \t\t\tinfo->screen_size = 2 << 20;\n" "> \t\t\tbreak;\n" "> \t\t}\n" - "> +\t} else if (par->chip = CHIP_988_VIRGE_VX) {\n" + "> +\t} else if (par->chip == CHIP_988_VIRGE_VX) {\n" "> +\t\tswitch ((regval & 0x60) >> 5) {\n" "> +\t\tcase 0: /* 2MB */\n" "> +\t\t\tinfo->screen_size = 2 << 20;\n" @@ -85,4 +85,4 @@ "> \n" > -b61f2f33e43387deabe809526a27dda1f521b39fae2b1639b71d7a2e7a9cb27f +6196ac08a4c6c2f700e6c1a2f0e2984f92a35a8c466a336c13f1b3d414594224
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.