X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fatm%2Ffirestream.c;fp=drivers%2Fatm%2Ffirestream.c;h=7f7ec288824d075ed2826422e113abba8bebd1a1;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=38fc054bd6715246f261f5a2e88e432026ef92eb;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c
index 38fc054bd..7f7ec2888 100644
--- a/drivers/atm/firestream.c
+++ b/drivers/atm/firestream.c
@@ -33,7 +33,6 @@
 #include <linux/kernel.h>
 #include <linux/mm.h>
 #include <linux/pci.h>
-#include <linux/poison.h>
 #include <linux/errno.h>
 #include <linux/atm.h>
 #include <linux/atmdev.h>
@@ -755,7 +754,7 @@ static void process_txdone_queue (struct fs_dev *dev, struct queue *q)
 			fs_kfree_skb (skb);
 
 			fs_dprintk (FS_DEBUG_ALLOC, "Free trans-d: %p\n", td); 
-			memset (td, ATM_POISON_FREE, sizeof(struct FS_BPENTRY));
+			memset (td, 0x12, sizeof (struct FS_BPENTRY));
 			kfree (td);
 			break;
 		default:
@@ -952,7 +951,7 @@ static int fs_open(struct atm_vcc *atm_vcc)
 		   it most likely that the chip will notice it. It also prevents us
 		   from having to wait for completion. On the other hand, we may
 		   need to wait for completion anyway, to see if it completed
-		   successfully. */
+		   succesfully. */
 
 		switch (atm_vcc->qos.aal) {
 		case ATM_AAL2:
@@ -1658,10 +1657,9 @@ static int __devinit fs_init (struct fs_dev *dev)
 	func_enter ();
 	pci_dev = dev->pci_dev;
 
-	printk (KERN_INFO "found a FireStream %d card, base %16llx, irq%d.\n",
+	printk (KERN_INFO "found a FireStream %d card, base %08lx, irq%d.\n", 
 		IS_FS50(dev)?50:155,
-		(unsigned long long)pci_resource_start(pci_dev, 0),
-		dev->pci_dev->irq);
+		pci_resource_start(pci_dev, 0), dev->pci_dev->irq);
 
 	if (fs_debug & FS_DEBUG_INIT)
 		my_hd ((unsigned char *) dev, sizeof (*dev));
@@ -1829,7 +1827,7 @@ static int __devinit fs_init (struct fs_dev *dev)
 		init_q (dev, &dev->rx_rq[i], RXB_RQ(i), RXRQ_NENTRIES, 1);
 
 	dev->irq = pci_dev->irq;
-	if (request_irq (dev->irq, fs_irq, IRQF_SHARED, "firestream", dev)) {
+	if (request_irq (dev->irq, fs_irq, SA_SHIRQ, "firestream", dev)) {
 		printk (KERN_WARNING "couldn't get irq %d for firestream.\n", pci_dev->irq);
 		/* XXX undo all previous stuff... */
 		return 1;