5 files changed, 5 insertions, 8 deletions

diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c
index 81bafd578478..2ee57bd52a01 100644
--- a/drivers/net/pcmcia/axnet_cs.c
+++ b/drivers/net/pcmcia/axnet_cs.c
@@ -270,7 +270,7 @@ static int try_io_port(struct pcmcia_device *link)
             /* for master/slave multifunction cards */
             link->io.Attributes2 = IO_DATA_PATH_WIDTH_8;
             link->irq.Attributes =
-                IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED;
+                IRQ_TYPE_DYNAMIC_SHARING;
         }
     } else {
         /* This should be two 16-port windows */
@@ -1065,14 +1065,11 @@ static netdev_tx_t axnet_start_xmit(struct sk_buff *skb,
            
         spin_lock_irqsave(&ei_local->page_lock, flags);
         outb_p(0x00, e8390_base + EN0_IMR);
-        spin_unlock_irqrestore(&ei_local->page_lock, flags);
         
         /*
          *      Slow phase with lock held.
          */
          
-        spin_lock_irqsave(&ei_local->page_lock, flags);
-        
         ei_local->irqlock = 1;
 
         send_length = max(length, ETH_ZLEN);
diff --git a/drivers/net/pcmcia/fmvj18x_cs.c b/drivers/net/pcmcia/fmvj18x_cs.c
index 8ad8384fc1c0..813aca3fc433 100644
--- a/drivers/net/pcmcia/fmvj18x_cs.c
+++ b/drivers/net/pcmcia/fmvj18x_cs.c
@@ -426,7 +426,7 @@ static int fmvj18x_config(struct pcmcia_device *link)
 
     if (link->io.NumPorts2 != 0) {
         link->irq.Attributes =
-                IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED;
+                IRQ_TYPE_DYNAMIC_SHARING;
         ret = mfc_try_io_port(link);
         if (ret != 0) goto failed;
     } else if (cardtype == UNGERMANN) {
diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c
index c2651aecbda3..776cad2f5715 100644
--- a/drivers/net/pcmcia/pcnet_cs.c
+++ b/drivers/net/pcmcia/pcnet_cs.c
@@ -490,7 +490,7 @@ static int try_io_port(struct pcmcia_device *link)
             /* for master/slave multifunction cards */
             link->io.Attributes2 = IO_DATA_PATH_WIDTH_8;
             link->irq.Attributes =
-                IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED;
+                IRQ_TYPE_DYNAMIC_SHARING;
         }
     } else {
         /* This should be two 16-port windows */
diff --git a/drivers/net/pcmcia/smc91c92_cs.c b/drivers/net/pcmcia/smc91c92_cs.c
index cc4853bc0253..6dd486d2977b 100644
--- a/drivers/net/pcmcia/smc91c92_cs.c
+++ b/drivers/net/pcmcia/smc91c92_cs.c
@@ -454,7 +454,7 @@ static int mhz_mfc_config(struct pcmcia_device *link)
     link->conf.Attributes |= CONF_ENABLE_SPKR;
     link->conf.Status = CCSR_AUDIO_ENA;
     link->irq.Attributes =
-        IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED;
+        IRQ_TYPE_DYNAMIC_SHARING;
     link->io.IOAddrLines = 16;
     link->io.Attributes2 = IO_DATA_PATH_WIDTH_8;
     link->io.NumPorts2 = 8;
diff --git a/drivers/net/pcmcia/xirc2ps_cs.c b/drivers/net/pcmcia/xirc2ps_cs.c
index a2eda28f903e..466fc72698c0 100644
--- a/drivers/net/pcmcia/xirc2ps_cs.c
+++ b/drivers/net/pcmcia/xirc2ps_cs.c
@@ -841,7 +841,7 @@ xirc2ps_config(struct pcmcia_device * link)
             link->conf.Attributes |= CONF_ENABLE_SPKR;
             link->conf.Status |= CCSR_AUDIO_ENA;
         }
-        link->irq.Attributes |= IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED ;
+        link->irq.Attributes |= IRQ_TYPE_DYNAMIC_SHARING;
         link->io.NumPorts2 = 8;
         link->io.Attributes2 = IO_DATA_PATH_WIDTH_8;
         if (local->dingo) {