patch-2.3.27 linux/drivers/scsi/aha152x.c

• Lines: 55
• Date: Thu Nov 11 16:57:30 1999
• Orig file: v2.3.26/linux/drivers/scsi/aha152x.c
• Orig date: Fri Oct 15 15:25:14 1999

diff -u --recursive --new-file v2.3.26/linux/drivers/scsi/aha152x.c linux/drivers/scsi/aha152x.c
@@ -352,12 +352,6 @@
 
 #include <scsi/scsicam.h>
 
-struct proc_dir_entry proc_scsi_aha152x =
-{
-	PROC_SCSI_AHA152X, 7, "aha152x",
-	S_IFDIR | S_IRUGO | S_IXUGO, 2
-};
-
 /* DEFINES */
 
 /* For PCMCIA cards, always use AUTOCONF */
@@ -716,8 +710,7 @@
 	}
 }
 
-#if 0
-/* called from init/main.c */
+#ifdef PCMCIA
 void aha152x_setup(char *str, int *ints)
 {
 	if (setup_count > 2)
@@ -745,8 +738,9 @@
 	} else
 		setup_count++;
 }
-#endif
+#endif /* PCMCIA */
 
+#ifndef MODULE
 static int __init do_aha152x_setup (char * str)
 {
 	if (setup_count > 2) {
@@ -765,10 +759,9 @@
 	return 1;
 }
 
-#ifndef MODULE
 __setup("aha152x=",do_aha152x_setup);
 #endif
-
+ 
 /*
  * Test, if port_base is valid.
  */
@@ -843,7 +836,7 @@
 	aha152x_config conf;
 #endif
 
-	tpnt->proc_dir = &proc_scsi_aha152x;
+	tpnt->proc_name = "aha152x";
 
 	for (i = 0; i < IRQS; i++)
 		aha152x_host[i] = (struct Scsi_Host *) NULL;