hi,
I think you forgot some revert of the aaccraid patch, thing like that
:
#ifdef CONFIG_SCSI_AACRAID
#include "aacraid/include/linit.h"
#endif
in drivers/scsci/hosts.c
make no sense.
revert patch attached
PS: even if it doen't change anything actually it may help when need
to apply the patch to don't have reject.
--
MandrakeSoft Inc http://www.chmouel.org
--Chmouel
--- linux/drivers/scsi/hosts.c.chmou Mon Dec 11 12:19:25 2000
+++ linux/drivers/scsi/hosts.c Mon Dec 11 12:25:42 2000
@@ -131,10 +131,6 @@
#include "aha1740.h"
#endif
-#ifdef CONFIG_SCSI_AACRAID
-#include "aacraid/include/linit.h"
-#endif
-
#ifdef CONFIG_SCSI_AIC7XXX
#include "aic7xxx.h"
#endif
@@ -492,9 +488,6 @@
#endif
#ifdef CONFIG_SCSI_AHA1740
AHA1740,
-#endif
-#ifdef CONFIG_SCSI_AACRAID
- AAC_HOST_TEMPLATE_ENTRY,
#endif
#ifdef CONFIG_SCSI_AIC7XXX
AIC7XXX,
--- linux/arch/i386/defconfig.chmou Mon Dec 11 12:19:23 2000
+++ linux/arch/i386/defconfig Mon Dec 11 12:21:41 2000
@@ -166,7 +166,6 @@
# CONFIG_SCSI_AHA152X is not set
# CONFIG_SCSI_AHA1542 is not set
# CONFIG_SCSI_AHA1740 is not set
-# CONFIG_SCSI_AACRAID is not set
# CONFIG_SCSI_AIC7XXX is not set
# CONFIG_SCSI_IPS is not set
# CONFIG_SCSI_ADVANSYS is not set
--- linux/MAINTAINERS.chmou Mon Dec 11 12:19:23 2000
+++ linux/MAINTAINERS Mon Dec 11 12:22:32 2000
@@ -93,12 +93,6 @@
L: linux-net@vger.kernel.org
S: Maintained
-AACRAID ADAPTEC RAID DRIVER
-P: Brian M. Boerner
-M: aacraid@ntc.adaptec.com
-L: To Be Announced
-S: Maintained
-
AD1816 SOUND DRIVER
P: Thorsten Knabe
M: Thorsten Knabe <tek@rbg.informatik.tu-darmstadt.de>
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Fri Dec 15 2000 - 21:00:22 EST