mtd/drivers/mtd/maps amd76xrom.c,1.11,1.12 ichxrom.c,1.5,1.6

[Thayne Harbaugh]

Update of /home/cvs/mtd/drivers/mtd/maps
In directory phoenix.infradead.org:/tmp/cvs-serv1169/drivers/mtd/maps

Modified Files:
	amd76xrom.c ichxrom.c 
Log Message:
* Added SST49LF008A to jedec_probe.c

* Added a PCI_DEVICE_ID_INTEL_ESB_1 (Intel Canterwood) to ichxrom.c

* No longer fail amd76xrom_init_one() if resource fragment cannot be reserved


Index: amd76xrom.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/amd76xrom.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- amd76xrom.c	12 Jul 2004 21:59:43 -0000	1.11
+++ amd76xrom.c	14 Jul 2004 14:44:31 -0000	1.12
@@ -189,7 +189,13 @@
 		if (request_resource(&iomem_resource, &info->window_rsrc)) {
 			printk(KERN_ERR MOD_NAME
 			       ": cannot reserve window resource fragment\n");
+#if 0
+			/*
+			 * The BIOS e820 usually reserves this so it isn't
+			 * usually an error.
+			 */
 			goto failed;
+#endif
 		}
 	}
 

Index: ichxrom.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/ichxrom.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ichxrom.c	14 Jul 2004 05:17:56 -0000	1.5
+++ ichxrom.c	14 Jul 2004 14:44:31 -0000	1.6
@@ -355,7 +355,9 @@
 	  PCI_ANY_ID, PCI_ANY_ID, },
 	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801EB_0,
 	  PCI_ANY_ID, PCI_ANY_ID, },
-	{ 0, },
+	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB_1,
+	  PCI_ANY_ID, PCI_ANY_ID, },
+usual	{ 0, },
 };
 
 MODULE_DEVICE_TABLE(pci, ichxrom_pci_tbl);