patch-2.3.99-pre7 linux/drivers/i2o/i2o_pci.c

• Lines: 56
• Date: Wed May 10 16:56:43 2000
• Orig file: v2.3.99-pre6/linux/drivers/i2o/i2o_pci.c
• Orig date: Wed Apr 26 16:34:07 2000

diff -u --recursive --new-file v2.3.99-pre6/linux/drivers/i2o/i2o_pci.c linux/drivers/i2o/i2o_pci.c
@@ -6,6 +6,7 @@
  *	
  *	Written by Alan Cox, Building Number Three Ltd
  * 	Modified by Deepak Saxena <deepak@plexity.net>
+ * 	Modified by Boji T Kannanthanam <boji.t.kannanthanam@intel.com>
  *
  *	This program is free software; you can redistribute it and/or
  *	modify it under the terms of the GNU General Public License
@@ -53,10 +54,10 @@
 	iounmap(((u8 *)c->post_port)-0x40);
 
 #ifdef CONFIG_MTRR
-       if(c->bus.pci.mtrr_reg0 > 0)
-               mtrr_del(c->bus.pci.mtrr_reg0, 0, 0);
-       if(c->bus.pci.mtrr_reg1 > 0)
-               mtrr_del(c->bus.pci.mtrr_reg1, 0, 0);
+	if(c->bus.pci.mtrr_reg0 > 0)
+		mtrr_del(c->bus.pci.mtrr_reg0, 0, 0);
+	if(c->bus.pci.mtrr_reg1 > 0)
+		mtrr_del(c->bus.pci.mtrr_reg1, 0, 0);
 #endif
 }
 
@@ -178,21 +179,21 @@
 	 * Enable Write Combining MTRR for IOP's memory region
 	 */
 #ifdef CONFIG_MTRR
-       c->bus.pci.mtrr_reg0 =
-                mtrr_add(c->mem_phys, size, MTRR_TYPE_WRCOMB, 1);
+	c->bus.pci.mtrr_reg0 =
+		mtrr_add(c->mem_phys, size, MTRR_TYPE_WRCOMB, 1);
 /*
 * If it is an INTEL i960 I/O processor then set the first 64K to Uncacheable
 * since the region contains the Messaging unit which shouldn't be cached.
 */
-       c->bus.pci.mtrr_reg1 = -1;
-       if(dev->vendor == PCI_VENDOR_ID_INTEL)
-        {
-       printk(KERN_INFO "i2o_pci: MTRR workaround for Intel i960 processor\n"); 
-       c->bus.pci.mtrr_reg1 =
-                mtrr_add(c->mem_phys, 65536, MTRR_TYPE_UNCACHABLE, 1);
-        if(c->bus.pci.mtrr_reg1< 0)
-                        printk(KERN_INFO "i2o_pci: Error in setting MTRR_TYPE_UNCACHABLE\n");
-       }
+	c->bus.pci.mtrr_reg1 = -1;
+	if(dev->vendor == PCI_VENDOR_ID_INTEL)
+	{
+	printk(KERN_INFO "I2O: MTRR workaround for Intel i960 processor\n"); 
+	c->bus.pci.mtrr_reg1 =
+		mtrr_add(c->mem_phys, 65536, MTRR_TYPE_UNCACHABLE, 1);
+	if(c->bus.pci.mtrr_reg1< 0)
+		printk(KERN_INFO "i2o_pci: Error in setting MTRR_TYPE_UNCACHABLE\n");
+	}
 
 #endif