mtd/drivers/mtd/maps amd76xrom.c,1.9,1.10

[David Woodhouse]

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

Modified Files:
	amd76xrom.c 
Log Message:
Merge from 2.6: NULL


Index: amd76xrom.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/amd76xrom.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- amd76xrom.c	23 Oct 2003 23:10:59 -0000	1.9
+++ amd76xrom.c	12 Jul 2004 14:26:14 -0000	1.10
@@ -92,7 +92,7 @@
 	static const u32 rom_probe_sizes[] = { 
 		5*1024*1024, 4*1024*1024, 2*1024*1024, 1024*1024, 512*1024, 
 		256*1024, 128*1024, 64*1024, 0};
-	static char *rom_probe_types[] = { "cfi_probe", "jedec_probe", 0 };
+	static char *rom_probe_types[] = { "cfi_probe", "jedec_probe", NULL };
 	u8 byte;
 	struct amd76xrom_map_info *info = &amd76xrom_map;
 	struct rom_window *window;
@@ -232,7 +232,7 @@
 	amd76xrom_cleanup(info);
 }
 
-static struct pci_device_id amd76xrom_pci_tbl[] __devinitdata = {
+static struct pci_device_id amd76xrom_pci_tbl[] = {
 	{ PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_VIPER_7410,  
 		PCI_ANY_ID, PCI_ANY_ID, },
 	{ PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_VIPER_7440,  
@@ -256,9 +256,9 @@
 {
 	struct pci_dev *pdev;
 	struct pci_device_id *id;
-	pdev = 0;
+	pdev = NULL;
 	for(id = amd76xrom_pci_tbl; id->vendor; id++) {
-		pdev = pci_find_device(id->vendor, id->device, 0);
+		pdev = pci_find_device(id->vendor, id->device, NULL);
 		if (pdev) {
 			break;
 		}