Circular dependencies in config, CONFIG_SCSI_AIC7XXX depends on
CONFIG_SCSI_AIC7XXX_OLD which depends on CONFIG_SCSI_AIC7XXX. Also it
does not cater for aic7xxx being a module. This patch checks
CONFIG_SCSI_AIC7XXX first, only if not set will it try
CONFIG_SCSI_AIC7XXX_OLD.
Against 2.4.4, will fit 2.4.5-pre1 and 2.4.4-ac5 with offsets.
Index: 4.1/drivers/scsi/Config.in
--- 4.1/drivers/scsi/Config.in Mon, 05 Mar 2001 10:47:15 +1100 kaos
(linux-2.4/T/b/29_Config.in 1.1.1.1 644)
+++ 4.1(w)/drivers/scsi/Config.in Sat, 05 May 2001 19:14:45 +1000 kaos
+(linux-2.4/T/b/29_Config.in 1.1.1.1 644)
@@ -51,7 +51,7 @@ dep_tristate 'Adaptec AHA152X/2825 suppo
dep_tristate 'Adaptec AHA1542 support' CONFIG_SCSI_AHA1542 $CONFIG_SCSI
dep_tristate 'Adaptec AHA1740 support' CONFIG_SCSI_AHA1740 $CONFIG_SCSI
source drivers/scsi/aic7xxx/Config.in
-if [ "$CONFIG_SCSI_AIC7XXX" != "y" ]; then
+if [ "$CONFIG_SCSI_AIC7XXX" = "n" ]; then
dep_tristate 'Old Adaptec AIC7xxx support' CONFIG_SCSI_AIC7XXX_OLD $CONFIG_SCSI
if [ "$CONFIG_SCSI_AIC7XXX_OLD" != "n" ]; then
bool ' Enable Tagged Command Queueing (TCQ) by default'
CONFIG_AIC7XXX_OLD_TCQ_ON_BY_DEFAULT
Index: 4.1/drivers/scsi/aic7xxx/Config.in
--- 4.1/drivers/scsi/aic7xxx/Config.in Mon, 05 Mar 2001 10:47:15 +1100 kaos
(linux-2.4/y/d/25_Config.in 1.1 644)
+++ 4.1(w)/drivers/scsi/aic7xxx/Config.in Sat, 05 May 2001 18:44:53 +1000 kaos
+(linux-2.4/y/d/25_Config.in 1.1 644)
@@ -1,7 +1,5 @@
-if [ "$CONFIG_SCSI_AIC7XXX_OLD" != "y" ]; then
- dep_tristate 'Adaptec AIC7xxx support' CONFIG_SCSI_AIC7XXX $CONFIG_SCSI
- if [ "$CONFIG_SCSI_AIC7XXX" != "n" ]; then
- int ' Maximum number of TCQ commands per device'
CONFIG_AIC7XXX_CMDS_PER_DEVICE 253
- int ' Initial bus reset delay in milli-seconds' CONFIG_AIC7XXX_RESET_DELAY
5000
- fi
+dep_tristate 'Adaptec AIC7xxx support' CONFIG_SCSI_AIC7XXX $CONFIG_SCSI
+if [ "$CONFIG_SCSI_AIC7XXX" != "n" ]; then
+ int ' Maximum number of TCQ commands per device' CONFIG_AIC7XXX_CMDS_PER_DEVICE
+253
+ int ' Initial bus reset delay in milli-seconds' CONFIG_AIC7XXX_RESET_DELAY 5000
fi
_______________________________________________
kbuild-devel mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/kbuild-devel
