diff for duplicates of <20111023141119.848736612@telegraphics.com.au> diff --git a/a/1.txt b/N1/1.txt index 77716ca..0c6f0b7 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -3,7 +3,8 @@ macfb won't init in black & white modes since fb_alloc_cmap() no longer works fo Signed-off-by: Finn Thain <fthain@telegraphics.com.au> Index: linux-m68k/drivers/video/macfb.c -=================================--- linux-m68k.orig/drivers/video/macfb.c 2011-10-22 23:02:22.000000000 +1100 +=================================================================== +--- linux-m68k.orig/drivers/video/macfb.c 2011-10-22 23:02:22.000000000 +1100 +++ linux-m68k/drivers/video/macfb.c 2011-10-23 00:50:51.000000000 +1100 @@ -592,12 +592,12 @@ static int __init macfb_init(void) if (!fb_info.screen_base) @@ -132,7 +133,8 @@ Index: linux-m68k/drivers/video/macfb.c if (vidtest) { macfb_setpalette = v8_brazil_setpalette; - macfb_defined.activate = FB_ACTIVATE_NOW; - v8_brazil_cmap_regs ioremap(DAC_BASE, 0x1000); + v8_brazil_cmap_regs = + ioremap(DAC_BASE, 0x1000); + macfb_defined.activate = FB_ACTIVATE_NOW; } - strcpy(macfb_fix.id, "LC"); @@ -146,7 +148,8 @@ Index: linux-m68k/drivers/video/macfb.c if (vidtest) { macfb_setpalette = v8_brazil_setpalette; - macfb_defined.activate = FB_ACTIVATE_NOW; - v8_brazil_cmap_regs ioremap(DAC_BASE, 0x1000); + v8_brazil_cmap_regs = + ioremap(DAC_BASE, 0x1000); + macfb_defined.activate = FB_ACTIVATE_NOW; } - strcpy(macfb_fix.id, "Color Classic"); diff --git a/a/content_digest b/N1/content_digest index 71433c3..1897ad8 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,19 +1,21 @@ "ref\020111023141108.856998818@telegraphics.com.au\0" "From\0Finn Thain <fthain@telegraphics.com.au>\0" "Subject\0[PATCH 02/16] macfb: fix black and white modes\0" - "Date\0Sun, 23 Oct 2011 14:11:10 +0000\0" + "Date\0Mon, 24 Oct 2011 01:11:10 +1100\0" "To\0Geert Uytterhoeven <geert@linux-m68k.org>\0" "Cc\0linux-m68k@vger.kernel.org" Florian Tobias Schandinat <FlorianSchandinat@gmx.de> " linux-fbdev@vger.kernel.org\0" "\00:1\0" + "fn\0macfb-bw-fix\0" "b\0" "macfb won't init in black & white modes since fb_alloc_cmap() no longer works for zero cmap length. Fix this and also clean up a few printk's and some stylistic inconsistencies.\n" "\n" "Signed-off-by: Finn Thain <fthain@telegraphics.com.au>\n" "\n" "Index: linux-m68k/drivers/video/macfb.c\n" - "=================================--- linux-m68k.orig/drivers/video/macfb.c\t2011-10-22 23:02:22.000000000 +1100\n" + "===================================================================\n" + "--- linux-m68k.orig/drivers/video/macfb.c\t2011-10-22 23:02:22.000000000 +1100\n" "+++ linux-m68k/drivers/video/macfb.c\t2011-10-23 00:50:51.000000000 +1100\n" "@@ -592,12 +592,12 @@ static int __init macfb_init(void)\n" " \tif (!fb_info.screen_base)\n" @@ -142,7 +144,8 @@ " \t\t\tif (vidtest) {\n" " \t\t\t\tmacfb_setpalette = v8_brazil_setpalette;\n" "-\t\t\t\tmacfb_defined.activate = FB_ACTIVATE_NOW;\n" - " \t\t\t\tv8_brazil_cmap_regs \t\t\t\t\tioremap(DAC_BASE, 0x1000);\n" + " \t\t\t\tv8_brazil_cmap_regs =\n" + " \t\t\t\t\tioremap(DAC_BASE, 0x1000);\n" "+\t\t\t\tmacfb_defined.activate = FB_ACTIVATE_NOW;\n" " \t\t\t}\n" "-\t\t\tstrcpy(macfb_fix.id, \"LC\");\n" @@ -156,7 +159,8 @@ " \t\t\tif (vidtest) {\n" " \t\t\t\tmacfb_setpalette = v8_brazil_setpalette;\n" "-\t\t\t\tmacfb_defined.activate = FB_ACTIVATE_NOW;\n" - " \t\t\t\tv8_brazil_cmap_regs \t\t\t\t\tioremap(DAC_BASE, 0x1000);\n" + " \t\t\t\tv8_brazil_cmap_regs =\n" + " \t\t\t\t\tioremap(DAC_BASE, 0x1000);\n" "+\t\t\t\tmacfb_defined.activate = FB_ACTIVATE_NOW;\n" " \t\t\t}\n" "-\t\t\tstrcpy(macfb_fix.id, \"Color Classic\");\n" @@ -189,4 +193,4 @@ " \n" fail_dealloc: -85fd50bbfa478c0072896690365a0bfaffc2fd1fd859ba1d72be2ce50df2d039 +87f05e6eeb8304e36547bb8a5a26e4ce56d1ce7acceb3efb11ce8811c930bc4c
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.