diff for duplicates of <1430343851-967-4-git-send-email-mcgrof@do-not-panic.com>
diff --git a/a/1.txt b/N1/1.txt
index 71f97b6..a363dac 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -51,8 +51,8 @@ index 8789e48..16936bb 100644
+ struct atyfb_par *par = (struct atyfb_par *) info->par;
+
+ if (!par->aux_start &&
-+ (info->fix.smem_len == 0x800000 ||
-+ (par->bus_type == ISA && info->fix.smem_len == 0x400000)))
++ (info->fix.smem_len = 0x800000 ||
++ (par->bus_type = ISA && info->fix.smem_len = 0x400000)))
+ info->fix.smem_len -= GUI_RESERVE;
+}
+
@@ -68,8 +68,8 @@ index 8789e48..16936bb 100644
- * unless the auxiliary register aperture is used.
- */
- if (!par->aux_start &&
-- (info->fix.smem_len == 0x800000 ||
-- (par->bus_type == ISA && info->fix.smem_len == 0x400000)))
+- (info->fix.smem_len = 0x800000 ||
+- (par->bus_type = ISA && info->fix.smem_len = 0x400000)))
- info->fix.smem_len -= GUI_RESERVE;
+ aty_fudge_framebuffer_len(info);
diff --git a/a/content_digest b/N1/content_digest
index 61d4db4..6432cb3 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -8,7 +8,7 @@
"Subject\0[PATCH v4 3/6] video: fbdev: atyfb: move framebuffer length fudging to helper\0"
]
[
- "Date\0Wed, 29 Apr 2015 14:44:08 -0700\0"
+ "Date\0Wed, 29 Apr 2015 21:44:08 +0000\0"
]
[
"To\0mingo\@elte.hu",
@@ -104,8 +104,8 @@
"+\tstruct atyfb_par *par = (struct atyfb_par *) info->par;\n",
"+\n",
"+\tif (!par->aux_start &&\n",
- "+\t (info->fix.smem_len == 0x800000 ||\n",
- "+\t (par->bus_type == ISA && info->fix.smem_len == 0x400000)))\n",
+ "+\t (info->fix.smem_len = 0x800000 ||\n",
+ "+\t (par->bus_type = ISA && info->fix.smem_len = 0x400000)))\n",
"+\t\tinfo->fix.smem_len -= GUI_RESERVE;\n",
"+}\n",
"+\n",
@@ -121,8 +121,8 @@
"-\t * unless the auxiliary register aperture is used.\n",
"-\t */\n",
"-\tif (!par->aux_start &&\n",
- "-\t (info->fix.smem_len == 0x800000 ||\n",
- "-\t (par->bus_type == ISA && info->fix.smem_len == 0x400000)))\n",
+ "-\t (info->fix.smem_len = 0x800000 ||\n",
+ "-\t (par->bus_type = ISA && info->fix.smem_len = 0x400000)))\n",
"-\t\tinfo->fix.smem_len -= GUI_RESERVE;\n",
"+\taty_fudge_framebuffer_len(info);\n",
" \n",
@@ -132,4 +132,4 @@
"2.3.2.209.gd67f9d5.dirty"
]
-0ad7368bf795f6509166a9981d5689dcbe1ac7d722f123f7d9d927d7c6eeca8e
+f45648c7cbba57acc4239f34dc95080381c0239be5b170b0670d3c2cdec4fadc
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.