diff for duplicates of <20100418215751.GA2733@joi.lan> diff --git a/a/1.txt b/N1/1.txt index 707f613..39654a4 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -163,7 +163,7 @@ index 7cfcd71..4628a59 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 " @@ -223,7 +223,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 cd38f85..1af5f54 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -6,7 +6,7 @@ "ref\020100413195004.GA4402@joi.lan\0" "From\0Marcin Slusarz <marcin.slusarz@gmail.com>\0" "Subject\0[PATCH] vga16fb, drm: vga16fb->drm handoff\0" - "Date\0Sun, 18 Apr 2010 21:57:51 +0000\0" + "Date\0Sun, 18 Apr 2010 23:57:51 +0200\0" "To\0Dave Airlie <airlied@redhat.com>\0" "Cc\0linux-fbdev@vger.kernel.org" nouveau@lists.freedesktop.org @@ -181,7 +181,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" @@ -241,7 +241,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" @@ -292,4 +292,4 @@ "-- \n" 1.7.0.4 -b915c6ee9c574df3f91179225b69b05f543da0f7dccbf8926e58eab952c06564 +873bf611927047b00f75b85cc9fd2789353a08868a46ae11cac26bf9a360c5dd
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.