diff for duplicates of <20100516153309.GC2793@joi.lan> diff --git a/a/1.txt b/N1/1.txt index d93c01f..676b0a9 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -64,7 +64,7 @@ index 7cfcd71..6deb57c 100644 + gen_aper = registered_fb[i]->apertures; + if (fb_do_apertures_overlap(gen_aper, a) || + (primary && gen_aper && gen_aper->count && -+ gen_aper->ranges[0].base = VGA_FB_PHYS)) { ++ gen_aper->ranges[0].base == VGA_FB_PHYS)) { - if (fb_do_apertures_overlap(registered_fb[i]->apertures, a)) { printk(KERN_ERR "fb: conflicting fb hw usage " @@ -124,7 +124,7 @@ index bf638a4..149c47a 100644 + info->flags = FBINFO_FLAG_DEFAULT | FBINFO_MISC_FIRMWARE | FBINFO_HWACCEL_YPAN; - i = (info->var.bits_per_pixel = 8) ? 256 : 16; + i = (info->var.bits_per_pixel == 8) ? 256 : 16; @@ -1354,6 +1368,9 @@ static int __devinit vga16fb_probe(struct platform_device *dev) vga16fb_update_fix(info); diff --git a/a/content_digest b/N1/content_digest index fdd48af..c6a77f2 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Marcin Slusarz <marcin.slusarz@gmail.com>\0" "Subject\0[PATCH v2 3/3] vga16fb, drm: vga16fb->drm handoff\0" - "Date\0Sun, 16 May 2010 15:33:09 +0000\0" + "Date\0Sun, 16 May 2010 17:33:09 +0200\0" "To\0Andrew Morton <akpm@linux-foundation.org>\0" "Cc\0James Simmons <jsimmons@infradead.org>" Ben Skeggs <bskeggs@redhat.com> @@ -78,7 +78,7 @@ "+\t\tgen_aper = registered_fb[i]->apertures;\n" "+\t\tif (fb_do_apertures_overlap(gen_aper, a) ||\n" "+\t\t\t(primary && gen_aper && gen_aper->count &&\n" - "+\t\t\t gen_aper->ranges[0].base = VGA_FB_PHYS)) {\n" + "+\t\t\t gen_aper->ranges[0].base == VGA_FB_PHYS)) {\n" " \n" "-\t\tif (fb_do_apertures_overlap(registered_fb[i]->apertures, a)) {\n" " \t\t\tprintk(KERN_ERR \"fb: conflicting fb hw usage \"\n" @@ -138,7 +138,7 @@ "+\tinfo->flags = FBINFO_FLAG_DEFAULT | FBINFO_MISC_FIRMWARE |\n" " \t\tFBINFO_HWACCEL_YPAN;\n" " \n" - " \ti = (info->var.bits_per_pixel = 8) ? 256 : 16;\n" + " \ti = (info->var.bits_per_pixel == 8) ? 256 : 16;\n" "@@ -1354,6 +1368,9 @@ static int __devinit vga16fb_probe(struct platform_device *dev)\n" " \n" " \tvga16fb_update_fix(info);\n" @@ -181,4 +181,4 @@ "-- \n" 1.7.1 -12f8441a97412db9382703ae6dbb8cef4195d5978be82374e22d18c0c508d6a6 +b65d0e19fe34d04dc3d0bb088c28112a7b02c4206de5ff8f9e85ce83799068d8
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.