diff for duplicates of <4861F5F1.3030003@renesas.com> diff --git a/a/1.txt b/N1/1.txt index 09ae8cf..aa85baa 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -160,7 +160,7 @@ index 0000000..57b1dfb + unsigned short cntr = IN16(par, LDCNTR); + int lps; + -+ if (blank == FB_BLANK_UNBLANK) { ++ if (blank = FB_BLANK_UNBLANK) { + cntr = LDCNTR_DON2 | LDCNTR_DON; + lps = 3; + if (pd->blank) @@ -241,7 +241,7 @@ index 0000000..57b1dfb + fix->smem_start = (unsigned long)par->fbmem; + fix->smem_len = par->vram; + -+ if ((var->grayscale) && (var->bits_per_pixel == 1)) ++ if ((var->grayscale) && (var->bits_per_pixel = 1)) + fix->visual = FB_VISUAL_MONO10; + else if (var->bits_per_pixel >= 15) + fix->visual = FB_VISUAL_TRUECOLOR; @@ -359,13 +359,13 @@ index 0000000..57b1dfb + if (!gray) + stride *= (bpp + 7) >> 3; + else { -+ if (bpp == 1) ++ if (bpp = 1) + stride >>= 3; -+ else if (bpp == 2) ++ else if (bpp = 2) + stride >>= 2; -+ else if (bpp == 4) ++ else if (bpp = 4) + stride >>= 1; -+ /* 6 bpp == 8 bpp */ ++ /* 6 bpp = 8 bpp */ + } + + /* if rotated, stride must be power of 2 */ @@ -525,11 +525,11 @@ index 0000000..57b1dfb + + vram = info->var.xres * info->var.yres; + if (info->var.grayscale) { -+ if (bpp == 1) ++ if (bpp = 1) + vram >>= 3; -+ else if (bpp == 2) ++ else if (bpp = 2) + vram >>= 2; -+ else if (bpp == 4) ++ else if (bpp = 4) + vram >>= 1; + } else if (bpp > 8) + vram *= 2; @@ -542,8 +542,7 @@ index 0000000..57b1dfb + vram = PAGE_SIZE; + + par->vram = vram; -+ par->fbmem = -+ dma_alloc_coherent(info->dev, vram, &par->fbdma, GFP_KERNEL); ++ par->fbmem + dma_alloc_coherent(info->dev, vram, &par->fbdma, GFP_KERNEL); + + if (!par->fbmem) + return -ENOMEM; @@ -571,7 +570,7 @@ index 0000000..57b1dfb + + /* Get base addr */ + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); -+ if (unlikely(res == NULL)) { ++ if (unlikely(res = NULL)) { + dev_err(&pdev->dev, "invalid resource\n"); + return -EINVAL; + } @@ -732,10 +731,3 @@ index 0000000..57b1dfb +MODULE_LICENSE("GPL"); -- 1.5.5.1 - - -------------------------------------------------------------------------- -Check out the new SourceForge.net Marketplace. -It's the best place to buy or sell services for -just about anything Open Source. -http://sourceforge.net/services/buy/index.php diff --git a/a/content_digest b/N1/content_digest index f0b90b1..0107b0a 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>\0" - "Subject\0[PATCH 1/4] video: sh7760fb: SH7760/SH7763 LCDC framebuffer driver part 1/3\0" - "Date\0Wed, 25 Jun 2008 16:38:25 +0900\0" + "Subject\0[PATCH 1/4] video: sh7760fb: SH7760/SH7763 LCDC framebuffer driver\0" + "Date\0Wed, 25 Jun 2008 07:38:25 +0000\0" "To\0Linux-fbdev-devel@lists.sourceforge.net\0" "Cc\0Paul Mundt <lethal@linux-sh.org>" " Linux-sh <linux-sh@vger.kernel.org>\0" @@ -168,7 +168,7 @@ "+\tunsigned short cntr = IN16(par, LDCNTR);\n" "+\tint lps;\n" "+\n" - "+\tif (blank == FB_BLANK_UNBLANK) {\n" + "+\tif (blank = FB_BLANK_UNBLANK) {\n" "+\t\tcntr = LDCNTR_DON2 | LDCNTR_DON;\n" "+\t\tlps = 3;\n" "+\t\tif (pd->blank)\n" @@ -249,7 +249,7 @@ "+\tfix->smem_start = (unsigned long)par->fbmem;\n" "+\tfix->smem_len = par->vram;\n" "+\n" - "+\tif ((var->grayscale) && (var->bits_per_pixel == 1))\n" + "+\tif ((var->grayscale) && (var->bits_per_pixel = 1))\n" "+\t\tfix->visual = FB_VISUAL_MONO10;\n" "+\telse if (var->bits_per_pixel >= 15)\n" "+\t\tfix->visual = FB_VISUAL_TRUECOLOR;\n" @@ -367,13 +367,13 @@ "+\tif (!gray)\n" "+\t\tstride *= (bpp + 7) >> 3;\n" "+\telse {\n" - "+\t\tif (bpp == 1)\n" + "+\t\tif (bpp = 1)\n" "+\t\t\tstride >>= 3;\n" - "+\t\telse if (bpp == 2)\n" + "+\t\telse if (bpp = 2)\n" "+\t\t\tstride >>= 2;\n" - "+\t\telse if (bpp == 4)\n" + "+\t\telse if (bpp = 4)\n" "+\t\t\tstride >>= 1;\n" - "+\t\t/* 6 bpp == 8 bpp */\n" + "+\t\t/* 6 bpp = 8 bpp */\n" "+\t}\n" "+\n" "+\t/* if rotated, stride must be power of 2 */\n" @@ -533,11 +533,11 @@ "+\n" "+\tvram = info->var.xres * info->var.yres;\n" "+\tif (info->var.grayscale) {\n" - "+\t\tif (bpp == 1)\n" + "+\t\tif (bpp = 1)\n" "+\t\t\tvram >>= 3;\n" - "+\t\telse if (bpp == 2)\n" + "+\t\telse if (bpp = 2)\n" "+\t\t\tvram >>= 2;\n" - "+\t\telse if (bpp == 4)\n" + "+\t\telse if (bpp = 4)\n" "+\t\t\tvram >>= 1;\n" "+\t} else if (bpp > 8)\n" "+\t\tvram *= 2;\n" @@ -550,8 +550,7 @@ "+\t\tvram = PAGE_SIZE;\n" "+\n" "+\tpar->vram = vram;\n" - "+\tpar->fbmem =\n" - "+\t dma_alloc_coherent(info->dev, vram, &par->fbdma, GFP_KERNEL);\n" + "+\tpar->fbmem +\t dma_alloc_coherent(info->dev, vram, &par->fbdma, GFP_KERNEL);\n" "+\n" "+\tif (!par->fbmem)\n" "+\t\treturn -ENOMEM;\n" @@ -579,7 +578,7 @@ "+\n" "+\t/* Get base addr */\n" "+\tres = platform_get_resource(pdev, IORESOURCE_MEM, 0);\n" - "+\tif (unlikely(res == NULL)) {\n" + "+\tif (unlikely(res = NULL)) {\n" "+\t\tdev_err(&pdev->dev, \"invalid resource\\n\");\n" "+\t\treturn -EINVAL;\n" "+\t}\n" @@ -739,13 +738,6 @@ "+MODULE_DESCRIPTION(\"FBdev for SH7760/63 integrated LCD Controller\");\n" "+MODULE_LICENSE(\"GPL\");\n" "-- \n" - "1.5.5.1\n" - "\n" - "\n" - "-------------------------------------------------------------------------\n" - "Check out the new SourceForge.net Marketplace.\n" - "It's the best place to buy or sell services for\n" - "just about anything Open Source.\n" - http://sourceforge.net/services/buy/index.php + 1.5.5.1 -aff20f6cfaba1dd1a9c4b474542de1e41b37bec216f25e02f2b34b048c8f2817 +0388400c35c3bc1c212ed26ed22354cb1df4130fc82637dd260379899e3367a7
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.