mtd/drivers/mtd/maps ichxrom.c,1.1,1.2

[David Woodhouse]

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

Modified Files:
	ichxrom.c 
Log Message:
Merge from 2.6: NULL, remove __devinitdata from pci table


Index: ichxrom.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/ichxrom.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ichxrom.c	27 Oct 2003 19:49:23 -0000	1.1
+++ ichxrom.c	12 Jul 2004 14:33:25 -0000	1.2
@@ -249,7 +249,7 @@
 
 	/* FIXME select the firmware hub and enable a window to it. */
 
-	info->mtd = 0;
+	info->mtd = NULL;
 	info->map.map_priv_1 = info->window_addr;
 
 	map_size = ICHX_FWH_REGION_SIZE;
@@ -307,7 +307,7 @@
 
 	del_mtd_device(info->mtd);
 	map_destroy(info->mtd);
-	info->mtd = 0;
+	info->mtd = NULL;
 	info->map.map_priv_1 = 0;
 
 	iounmap((void *)(info->window_addr));
@@ -322,7 +322,7 @@
 #endif
 }
 
-static struct pci_device_id ichxrom_pci_tbl[] __devinitdata = {
+static struct pci_device_id ichxrom_pci_tbl[] = {
 	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801BA_0, 
 	  PCI_ANY_ID, PCI_ANY_ID, },
 	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_0, 
@@ -348,11 +348,11 @@
 static struct pci_dev *mydev;
 int __init init_ichxrom(void)
 {
-	struct pci_dev *pdev;
+	struct pci_dev *pdev = NULL;
 	struct pci_device_id *id;
-	pdev = 0;
-	for(id = ichxrom_pci_tbl; id->vendor; id++) {
-		pdev = pci_find_device(id->vendor, id->device, 0);
+
+	for (id = ichxrom_pci_tbl; id->vendor; id++) {
+		pdev = pci_find_device(id->vendor, id->device, NULL);
 		if (pdev) {
 			break;
 		}