diff -urN linux-2.2.16-3-aacraid-1.0.4/drivers/scsi/aacraid/KNOWNBUGS linux-2.2.16-3-aacraid-1.0.5/drivers/scsi/aacraid/KNOWNBUGS
--- linux-2.2.16-3-aacraid-1.0.4/drivers/scsi/aacraid/KNOWNBUGS	Mon Jul 24 17:21:48 2000
+++ linux-2.2.16-3-aacraid-1.0.5/drivers/scsi/aacraid/KNOWNBUGS	Wed Dec 31 19:00:00 1969
@@ -1,11 +0,0 @@
-The aacraid driver is new to open source and has not seen extensive
-testing when compiled as part of the resident kernel. The module
-version has seen a number of QA cycles and appears to be very stable.
-
-There is however a known problem when compiling the aacraid driver
-as part of the resident kernel in an SMP environment. The end
-result is a kernel panic allmost 100% of the time during boot.
-
-It appears the same CPU is trying to acquire the same spinlock more
-than once, which we all know is bad. Once this problem has been
-resolved, a patch will be distributed.
\ No newline at end of file
diff -urN linux-2.2.16-3-aacraid-1.0.4/drivers/scsi/aacraid/Makefile linux-2.2.16-3-aacraid-1.0.5/drivers/scsi/aacraid/Makefile
--- linux-2.2.16-3-aacraid-1.0.4/drivers/scsi/aacraid/Makefile	Mon Jul 24 17:18:55 2000
+++ linux-2.2.16-3-aacraid-1.0.5/drivers/scsi/aacraid/Makefile	Mon Jul 24 17:20:27 2000
@@ -101,7 +101,7 @@
 	${WARNINGS} \
 	-O2 -fomit-frame-pointer
 
-CFLAGS=${COMMON_FLAGS} ${EXTRA_FLAGS}
+AACFLAGS=${CFLAGS} ${COMMON_FLAGS} ${EXTRA_FLAGS}
 
 ###############################################################################
 ### DO GENERAL STUFF
@@ -130,42 +130,42 @@
 ###############################################################################
 
 linit.o: ./linit.c
-	$(CC) $(COMMON_FLAGS) $(CFLAGS) -c -o linit.o ./linit.c
+	$(CC) $(COMMON_FLAGS) $(AACFLAGS) -c -o linit.o ./linit.c
 
 aachba.o: ./aachba.c
-	$(CC) $(COMMON_FLAGS) $(CFLAGS) -c -o aachba.o ./aachba.c
+	$(CC) $(COMMON_FLAGS) $(AACFLAGS) -c -o aachba.o ./aachba.c
 
 osddi.o: ./osddi.c
-	$(CC) $(COMMON_FLAGS) $(CFLAGS) -c -o osddi.o ./osddi.c
+	$(CC) $(COMMON_FLAGS) $(AACFLAGS) -c -o osddi.o ./osddi.c
 
 osfuncs.o: ./osfuncs.c
-	$(CC) $(COMMON_FLAGS) $(CFLAGS) -c -o osfuncs.o ./osfuncs.c
+	$(CC) $(COMMON_FLAGS) $(AACFLAGS) -c -o osfuncs.o ./osfuncs.c
 
 commctrl.o:  ./commctrl.c
-	$(CC) $(COMMON_FLAGS) $(CFLAGS) -c -o commctrl.o ./commctrl.c
+	$(CC) $(COMMON_FLAGS) $(AACFLAGS) -c -o commctrl.o ./commctrl.c
 
 comminit.o:  ./comminit.c
-	$(CC) $(COMMON_FLAGS) $(CFLAGS) -c -o comminit.o ./comminit.c
+	$(CC) $(COMMON_FLAGS) $(AACFLAGS) -c -o comminit.o ./comminit.c
 
 commsup.o:  ./commsup.c
-	$(CC) $(COMMON_FLAGS) $(CFLAGS) -c -o commsup.o ./commsup.c
+	$(CC) $(COMMON_FLAGS) $(AACFLAGS) -c -o commsup.o ./commsup.c
 
 dpcsup.o:  ./dpcsup.c
-	$(CC) $(COMMON_FLAGS) $(CFLAGS) -c -o dpcsup.o ./dpcsup.c
+	$(CC) $(COMMON_FLAGS) $(AACFLAGS) -c -o dpcsup.o ./dpcsup.c
 
 aacid.o:  ./aacid.c
-	$(CC) $(COMMON_FLAGS) $(CFLAGS) -c -o aacid.o ./aacid.c
+	$(CC) $(COMMON_FLAGS) $(AACFLAGS) -c -o aacid.o ./aacid.c
 
 port.o:  ./port.c
-	$(CC) $(COMMON_FLAGS) $(CFLAGS) -c -o port.o ./port.c
+	$(CC) $(COMMON_FLAGS) $(AACFLAGS) -c -o port.o ./port.c
 
 ossup.o:  ./ossup.c
-	$(CC) $(COMMON_FLAGS) $(CFLAGS) -c -o ossup.o ./ossup.c
+	$(CC) $(COMMON_FLAGS) $(AACFLAGS) -c -o ossup.o ./ossup.c
 
 rx.o:  ./rx.c
-	$(CC) $(COMMON_FLAGS) $(CFLAGS) -c -o rx.o ./rx.c
+	$(CC) $(COMMON_FLAGS) $(AACFLAGS) -c -o rx.o ./rx.c
 
 sap1sup.o: ./sap1sup.c
-	$(CC) $(COMMON_FLAGS) $(CFLAGS) -c -o sap1sup.o ./sap1sup.c
+	$(CC) $(COMMON_FLAGS) $(AACFLAGS) -c -o sap1sup.o ./sap1sup.c