diff for duplicates of <20100420195441.GA2915@joi.lan> diff --git a/a/1.txt b/N1/1.txt index 3cc92ca..01745ac 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -143,7 +143,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 " @@ -203,7 +203,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 d3e97a2..d703f0f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -8,7 +8,7 @@ "ref\0alpine.LFD.2.00.1004191716020.2733@casper.infradead.org\0" "From\0Marcin Slusarz <marcin.slusarz@gmail.com>\0" "Subject\0Re: [PATCH] vga16fb, drm: vga16fb->drm handoff\0" - "Date\0Tue, 20 Apr 2010 19:54:41 +0000\0" + "Date\0Tue, 20 Apr 2010 21:54:41 +0200\0" "To\0James Simmons <jsimmons@infradead.org>\0" "Cc\0linux-fbdev@vger.kernel.org" nouveau@lists.freedesktop.org @@ -164,7 +164,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" @@ -224,7 +224,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" @@ -267,4 +267,4 @@ "-- \n" 1.7.0.4 -d68d6f4dfc188d317995247604de7f71fb2ffd2c8df7208a45c71febadff88c0 +e6438cdb90a73f6e9ad35b08387842c5be6c1719a3be706f0f927e1495de8af3
diff --git a/a/1.txt b/N2/1.txt index 3cc92ca..01745ac 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -143,7 +143,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 " @@ -203,7 +203,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/N2/content_digest index d3e97a2..f973baf 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -8,14 +8,14 @@ "ref\0alpine.LFD.2.00.1004191716020.2733@casper.infradead.org\0" "From\0Marcin Slusarz <marcin.slusarz@gmail.com>\0" "Subject\0Re: [PATCH] vga16fb, drm: vga16fb->drm handoff\0" - "Date\0Tue, 20 Apr 2010 19:54:41 +0000\0" + "Date\0Tue, 20 Apr 2010 21:54:41 +0200\0" "To\0James Simmons <jsimmons@infradead.org>\0" - "Cc\0linux-fbdev@vger.kernel.org" + "Cc\0Dave Airlie <airlied@redhat.com>" + linux-fbdev@vger.kernel.org nouveau@lists.freedesktop.org LKML <linux-kernel@vger.kernel.org> dri-devel <dri-devel@lists.freedesktop.org> Peter Jones <pjones@redhat.com> - Dave Airlie <airlied@redhat.com> " Andrew Morton <akpm@linux-foundation.org>\0" "\00:1\0" "b\0" @@ -164,7 +164,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" @@ -224,7 +224,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" @@ -267,4 +267,4 @@ "-- \n" 1.7.0.4 -d68d6f4dfc188d317995247604de7f71fb2ffd2c8df7208a45c71febadff88c0 +b4708b184891346756a946f7beeed7c43bd714e2fa0b2bbf04e8def9c5d6e303
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.