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

• Lines: 32
• Date: 2004-02-18 05:36:31.000000000 -0800
• Orig file: linux-2.4.24/drivers/scsi/aha152x.c
• Orig date: 2003-08-25 04:44:42.000000000 -0700

diff -urN linux-2.4.24/drivers/scsi/aha152x.c linux-2.4.25/drivers/scsi/aha152x.c
@@ -222,10 +222,6 @@
 
 #include <linux/module.h>
 
-#if defined(PCMCIA)
-#undef MODULE
-#endif
-
 #include <linux/sched.h>
 #include <asm/irq.h>
 #include <asm/io.h>
@@ -254,6 +250,10 @@
 
 #include <scsi/scsicam.h>
 
+#if defined(PCMCIA)
+#undef MODULE
+#endif
+
 /* DEFINES */
 
 /* For PCMCIA cards, always use AUTOCONF */
@@ -3951,7 +3951,9 @@
 	return thislength < length ? thislength : length;
 }
 
+#ifndef PCMCIA
 /* Eventually this will go into an include file, but this will be later */
 static Scsi_Host_Template driver_template = AHA152X;
 
 #include "scsi_module.c"
+#endif