All of lore.kernel.org
 help / color / mirror / Atom feed

diff for duplicates of <1426893517-2511-31-git-send-email-mcgrof@do-not-panic.com>

diff --git a/a/1.txt b/N1/1.txt
index 106cce0..ff67760 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -115,8 +115,7 @@ index 44f99a6..db023a9 100644
 @@ -1723,7 +1719,7 @@ static int neo_map_video(struct fb_info *info, struct pci_dev *dev,
  	}
  
- 	info->screen_base =
--	    ioremap(info->fix.smem_start, info->fix.smem_len);
+ 	info->screen_base -	    ioremap(info->fix.smem_start, info->fix.smem_len);
 +	    ioremap_wc(info->fix.smem_start, info->fix.smem_len);
  	if (!info->screen_base) {
  		printk("neofb: unable to map screen memory\n");
@@ -126,8 +125,7 @@ index 44f99a6..db023a9 100644
  		       info->screen_base);
  
 -#ifdef CONFIG_MTRR
--	((struct neofb_par *)(info->par))->mtrr =
--		mtrr_add(info->fix.smem_start, pci_resource_len(dev, 0),
+-	((struct neofb_par *)(info->par))->mtrr -		mtrr_add(info->fix.smem_start, pci_resource_len(dev, 0),
 -				MTRR_TYPE_WRCOMB, 1);
 -#endif
 +	par->wc_cookie = arch_phys_wc_add(info->fix.smem_start,
diff --git a/a/content_digest b/N1/content_digest
index 687c58d..6e5352c 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -8,7 +8,7 @@
   "Subject\0[PATCH v1 30/47] video: fbdev: neofb: use arch_phys_wc_add() and ioremap_wc()\0"
 ]
 [
-  "Date\0Fri, 20 Mar 2015 16:18:20 -0700\0"
+  "Date\0Fri, 20 Mar 2015 23:18:20 +0000\0"
 ]
 [
   "To\0luto\@amacapital.net",
@@ -158,8 +158,7 @@
   "\@\@ -1723,7 +1719,7 \@\@ static int neo_map_video(struct fb_info *info, struct pci_dev *dev,\n",
   " \t}\n",
   " \n",
-  " \tinfo->screen_base =\n",
-  "-\t    ioremap(info->fix.smem_start, info->fix.smem_len);\n",
+  " \tinfo->screen_base -\t    ioremap(info->fix.smem_start, info->fix.smem_len);\n",
   "+\t    ioremap_wc(info->fix.smem_start, info->fix.smem_len);\n",
   " \tif (!info->screen_base) {\n",
   " \t\tprintk(\"neofb: unable to map screen memory\\n\");\n",
@@ -169,8 +168,7 @@
   " \t\t       info->screen_base);\n",
   " \n",
   "-#ifdef CONFIG_MTRR\n",
-  "-\t((struct neofb_par *)(info->par))->mtrr =\n",
-  "-\t\tmtrr_add(info->fix.smem_start, pci_resource_len(dev, 0),\n",
+  "-\t((struct neofb_par *)(info->par))->mtrr -\t\tmtrr_add(info->fix.smem_start, pci_resource_len(dev, 0),\n",
   "-\t\t\t\tMTRR_TYPE_WRCOMB, 1);\n",
   "-#endif\n",
   "+\tpar->wc_cookie = arch_phys_wc_add(info->fix.smem_start,\n",
@@ -218,4 +216,4 @@
   "2.3.2.209.gd67f9d5.dirty"
 ]
 
-740e42333b55c6e8bc829a7ae64f1a84498e8f44e647e088c279728c72ad6c6a
+8151106a9ae5ca53e7bd3b419745254e1387bc394b6f0293b1d71b37bf8ffded
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.