diff for duplicates of <201112192339.52676.linux@rainbow-software.org> diff --git a/a/1.txt b/N1/1.txt index 514fe69..56aca43 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -12,7 +12,7 @@ Signed-off-by: Ondrej Zary <linux@rainbow-software.org> --- 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); - @@ -34,7 +34,7 @@ Signed-off-by: Ondrej Zary <linux@rainbow-software.org> 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 65d4b3c..6135dc0 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Ondrej Zary <linux@rainbow-software.org>\0" "Subject\0[PATCH] s3fb: fix Virge/VX\0" - "Date\0Mon, 19 Dec 2011 22:39:47 +0000\0" + "Date\0Mon, 19 Dec 2011 23:39:47 +0100\0" "To\0Florian Tobias Schandinat <FlorianSchandinat@gmx.de>\0" "Cc\0Paul Mundt <lethal@linux-sh.org>" Ondrej Zajicek <santiago@crfreenet.org> @@ -22,7 +22,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" @@ -44,7 +44,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" @@ -77,4 +77,4 @@ "-- \n" Ondrej Zary -6467a26f64d182f3278f3ea4d8b30f9385fed9444b7abf99cb1069924e520d8f +c662a10640ae4e7274d94edb7879f01c939042a1341231ee53f8be21ad388263
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.