Skip to contentSkip to conversation

Acorn SCSI loading

PATCH In review Torben Mathiasen 2 participants 2 messages Jan 30, 2001 – Jan 31, 2001

lore
Share & tools
lore

Torben Mathiasen

author
#0 lore raw

PATCH 1/1 Acorn SCSI loading

Hi,

Just noticed the SCSI drivers for the ACORN bus weren't updated to the new initialization. AFAIK these drivers couldn't have been functional without this patch.

Patch is against 2.4.1

Signature · 3 lines
Torben Mathiasen <[email protected]>
Linux ThunderLAN maintainer 
http://opensource.compaq.com
drivers/acorn/scsi/acornscsi.c renamed from opt/kernel/kernels/linux/drivers/acorn/scsi/acornscsi.c +0 -2
diff -ur /opt/kernel/kernels/linux/drivers/acorn/scsi/acornscsi.c linux/drivers/acorn/scsi/acornscsi.c
@@ -3118,9 +3118,7 @@
     return pos;
 }
 
-#ifdef MODULE
 
 Scsi_Host_Template driver_template = ACORNSCSI_3;
 
 #include "../../scsi/scsi_module.c"
-#endif
drivers/acorn/scsi/arxescsi.c renamed from opt/kernel/kernels/linux/drivers/acorn/scsi/arxescsi.c +0 -2
diff -ur /opt/kernel/kernels/linux/drivers/acorn/scsi/arxescsi.c linux/drivers/acorn/scsi/arxescsi.c
@@ -416,8 +416,6 @@
 	return pos;
 }
 
-#ifdef MODULE
 Scsi_Host_Template driver_template = ARXEScsi;
 
 #include "../../scsi/scsi_module.c"
-#endif
drivers/acorn/scsi/cumana_1.c renamed from opt/kernel/kernels/linux/drivers/acorn/scsi/cumana_1.c +0 -2
diff -ur /opt/kernel/kernels/linux/drivers/acorn/scsi/cumana_1.c linux/drivers/acorn/scsi/cumana_1.c
@@ -359,9 +359,7 @@
 
 #include "../../scsi/NCR5380.c"
 
-#ifdef MODULE
 
 Scsi_Host_Template driver_template = CUMANA_NCR5380;
 
 #include "../../scsi/scsi_module.c"
-#endif
drivers/acorn/scsi/cumana_2.c renamed from opt/kernel/kernels/linux/drivers/acorn/scsi/cumana_2.c +0 -2
diff -ur /opt/kernel/kernels/linux/drivers/acorn/scsi/cumana_2.c linux/drivers/acorn/scsi/cumana_2.c
@@ -541,8 +541,6 @@
 	return pos;
 }
 
-#ifdef MODULE
 Scsi_Host_Template driver_template = CUMANASCSI_2;
 
 #include "../../scsi/scsi_module.c"
-#endif
drivers/acorn/scsi/ecoscsi.c renamed from opt/kernel/kernels/linux/drivers/acorn/scsi/ecoscsi.c +0 -2
diff -ur /opt/kernel/kernels/linux/drivers/acorn/scsi/ecoscsi.c linux/drivers/acorn/scsi/ecoscsi.c
@@ -233,9 +233,7 @@
 
 #include "../../scsi/NCR5380.c"
 
-#ifdef MODULE
 
 Scsi_Host_Template driver_template = ECOSCSI_NCR5380;
 
 #include "../../scsi/scsi_module.c"
-#endif
drivers/acorn/scsi/eesox.c renamed from opt/kernel/kernels/linux/drivers/acorn/scsi/eesox.c +0 -2
diff -ur /opt/kernel/kernels/linux/drivers/acorn/scsi/eesox.c linux/drivers/acorn/scsi/eesox.c
@@ -543,8 +543,6 @@
 	return pos;
 }
 
-#ifdef MODULE
 Scsi_Host_Template driver_template = EESOXSCSI;
 
 #include "../../scsi/scsi_module.c"
-#endif
drivers/acorn/scsi/oak.c renamed from opt/kernel/kernels/linux/drivers/acorn/scsi/oak.c +0 -2
diff -ur /opt/kernel/kernels/linux/drivers/acorn/scsi/oak.c linux/drivers/acorn/scsi/oak.c
@@ -226,9 +226,7 @@
 
 #include "../../scsi/NCR5380.c"
 
-#ifdef MODULE
 
 Scsi_Host_Template driver_template = OAK_NCR5380;
 
 #include "../../scsi/scsi_module.c"
-#endif
drivers/acorn/scsi/powertec.c renamed from opt/kernel/kernels/linux/drivers/acorn/scsi/powertec.c +0 -2
diff -ur /opt/kernel/kernels/linux/drivers/acorn/scsi/powertec.c linux/drivers/acorn/scsi/powertec.c
@@ -445,8 +445,6 @@
 	return pos;
 }
 
-#ifdef MODULE
 Scsi_Host_Template driver_template = POWERTECSCSI;
 
 #include "../../scsi/scsi_module.c"
-#endif
#1 lore raw
Quoted 3 lines · Torben Mathiasen

Just noticed the SCSI drivers for the ACORN bus weren't updated to the new initialization. AFAIK these drivers couldn't have been functional without this patch.

Please don't apply these!

I've already got patches in the ARM tree, and the -ac tree to fix this. The problem is to do the necessary stuff to get them into Linus tree. (They've existed since the SCSI changes came about).
_____

  |_____| ------------------------------------------------- ---+---+-
  |   |        Russell King       [email protected]      --- ---
  | | | |            http://www.arm.linux.org.uk/            /  /  |
  | +-+-+                                                     --- -+-
  /   |               THE developer of ARM Linux              |+| /|\
 /  | | |                                                     ---  |
    +-+-+ -------------------------------------------------  /\\\  |

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
Please read the FAQ at http://www.tux.org/lkml/