diff -burNp --exclude-from=/home/mdomsch/excludes linux-2.4.17-pre1/drivers/scsi/aacraid/commctrl.c linux/drivers/scsi/aacraid/commctrl.c
--- linux-2.4.17-pre1/drivers/scsi/aacraid/commctrl.c	Fri Nov 30 16:25:20 2001
+++ linux/drivers/scsi/aacraid/commctrl.c	Fri Nov 30 11:09:37 2001
@@ -345,9 +345,9 @@ static int close_getadapter_fib(struct a
 		 (fibctx->size != sizeof(struct aac_fib_context))) {
 		return -EINVAL;
 	}
-	spin_lock_irqsave(dev->fib_lock, flags);
+	spin_lock_irqsave(&dev->fib_lock, flags);
 	status = aac_close_fib_context(dev, fibctx);
-	spin_unlock_irqrestore(dev->fib_lock, flags);
+	spin_unlock_irqrestore(&dev->fib_lock, flags);
 	return status;
 }
 
diff -burNp --exclude-from=/home/mdomsch/excludes linux-2.4.17-pre1/drivers/scsi/aacraid/comminit.c linux/drivers/scsi/aacraid/comminit.c
--- linux-2.4.17-pre1/drivers/scsi/aacraid/comminit.c	Fri Nov 30 16:25:20 2001
+++ linux/drivers/scsi/aacraid/comminit.c	Fri Nov 30 13:12:23 2001
@@ -221,10 +221,8 @@ int aac_comm_init(struct aac_dev * dev)
 	/*
 	 *	Now allocate and initialize the zone structures used as our 
 	 *	pool of FIB context records.  The size of the zone is based
-	 *	on the system memory size.  We also initialize the mutex used
-	 *	to protect the zone.
+	 *	on the system memory size.
 	 */
-	spin_lock_init(&dev->FibContextZoneSpinLock);
 
 	/*
 	 *	Allocate the physically contigous space for the commuication
diff -burNp --exclude-from=/home/mdomsch/excludes linux-2.4.17-pre1/drivers/scsi/aacraid/include/aacraid.h linux/drivers/scsi/aacraid/include/aacraid.h
--- linux-2.4.17-pre1/drivers/scsi/aacraid/include/aacraid.h	Fri Nov 30 16:25:20 2001
+++ linux/drivers/scsi/aacraid/include/aacraid.h	Fri Nov 30 15:00:06 2001
@@ -1,4 +1,9 @@
-#define dprintk(x)
+#if 1
+#define dprintk(x...) do { } while(0);
+#else
+#define dprintk(x...) printk x
+#endif
+
 
 #define FAILURE 1
 #define	AAC_MAX_ADAPTERS 64