patch-2.4.23 linux-2.4.23/drivers/scsi/aic7xxx/aic7xxx_osm.c

Next file: linux-2.4.23/drivers/scsi/changelog.megaraid2
Previous file: linux-2.4.23/drivers/scsi/aacraid/linit.c
Back to the patch index
Back to the overall index

diff -urN linux-2.4.22/drivers/scsi/aic7xxx/aic7xxx_osm.c linux-2.4.23/drivers/scsi/aic7xxx/aic7xxx_osm.c
@@ -1552,6 +1552,7 @@
 
 	/* Still equal.  Sort by BIOS address, ioport, or bus/slot/func. */
 	switch (rvalue) {
+#ifdef CONFIG_PCI
 	case AHC_PCI:
 	{
 		char primary_channel;
@@ -1584,6 +1585,8 @@
 			value = 1;
 		break;
 	}
+#endif
+#ifdef CONFIG_EISA
 	case AHC_EISA:
 		if ((rahc->flags & AHC_BIOS_ENABLED) != 0) {
 			value = rahc->platform_data->bios_address
@@ -1593,6 +1596,7 @@
 			      - lahc->bsh.ioport; 
 		}
 		break;
+#endif
 	default:
 		panic("ahc_softc_sort: invalid bus type");
 	}

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)