Merge tp1.ruhr-uni-bochum.de:/home/kai/kernel/v2.5/linus-2.5.vm

into tp1.ruhr-uni-bochum.de:/home/kai/kernel/v2.5/linux-2.5.isdn

drivers/isdn/hardware/avm/avmcard.h

@@ -10,6 +10,8 @@
 #ifndef _AVMCARD_H_
 #define _AVMCARD_H_
 
+#include <linux/spinlock.h>
+
 #define	AVMB1_PORTLEN		0x1f
 #define AVM_MAXVERSION		8
 #define AVM_NCCI_PER_CHANNEL	4
@@ -57,6 +59,8 @@ typedef struct avmcard_dmainfo {
 
 typedef struct avmcard {
 	char name[32];
+  
+	spinlock_t lock;
 	unsigned int port;
 	unsigned irq;
 	unsigned long membase;

drivers/isdn/hardware/avm/b1pci.c

@@ -258,6 +258,7 @@ static int b1pciv4_add_card(struct capi_driver *driver,
 		goto err;
 	}
 	memset(card, 0, sizeof(avmcard));
+	spin_lock_init(&card->lock);
 
         card->dma = avmcard_dma_alloc(driver->name, dev, 2048+128, 2048+128);
 	if (!card->dma) {

drivers/isdn/hardware/avm/t1pci.c

@@ -66,6 +66,8 @@ static int t1pci_add_card(struct capi_driver *driver,
 		goto err;
 	}
 	memset(card, 0, sizeof(avmcard));
+	spin_lock_init(&card->lock);
+
         card->dma = avmcard_dma_alloc(driver->name, dev, 2048+128, 2048+128);
 	if (!card->dma) {
 		printk(KERN_WARNING "%s: no memory.\n", driver->name);