Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: (53 commits)
  m68knommu: Make PAGE_SIZE available to assembly files.
  m68knommu: fix ColdFire definition of CLOCK_TICK_RATE
  m68knommu: set multi-function pins for ethernet when enabled
  m68knommu: remove special interrupt handling code for ne2k support
  m68knommu: relax IO_SPACE_LIMIT setting
  m68knommu: remove ColdFire direct interrupt register access
  m68knommu: create a speciailized ColdFire 5272 interrupt controller
  m68knommu: add support for second interrupt controller of ColdFire 5249
  m68knommu: clean up old ColdFire timer irq setup
  m68knommu: map ColdFire interrupts to correct masking bits
  m68knommu: clean up ColdFire 532x CPU timer setup
  m68knommu: simplify ColdFire "timers" clock initialization
  m68knommu: support code to mask external interrupts on old ColdFire CPU's
  m68knommu: merge old ColdFire interrupt controller masking macros
  m68knommu: remove duplicate ColdFire mcf_autovector() code
  m68knommu: move ColdFire INTC definitions to new include file
  m68knommu: mask off all interrupts in ColdFire intc-simr controller
  m68knommu: remove timer device interrupt setup for ColdFire 532x
  m68knommu: remove interrupt masking from ColdFire pit timer
  m68knommu: remove unecessary interrupt level setting in ColdFire 520x setup
  ...

1 files changed, 3 insertions, 15 deletions

diff --git a/drivers/net/fec.c b/drivers/net/fec.c
index b47201874d84..29234380e6c6 100644
--- a/drivers/net/fec.c
+++ b/drivers/net/fec.c
@@ -1154,19 +1154,9 @@ static void __inline__ fec_request_mii_intr(struct net_device *dev)
                 printk("FEC: Could not allocate fec(MII) IRQ(66)!\n");
 }
 
-static void __inline__ fec_disable_phy_intr(void)
+static void __inline__ fec_disable_phy_intr(struct net_device *dev)
 {
-        volatile unsigned long *icrp;
-        icrp = (volatile unsigned long *) (MCF_MBAR + MCFSIM_ICR1);
-        *icrp = 0x08000000;
-}
-
-static void __inline__ fec_phy_ack_intr(void)
-{
-        volatile unsigned long *icrp;
-        /* Acknowledge the interrupt */
-        icrp = (volatile unsigned long *) (MCF_MBAR + MCFSIM_ICR1);
-        *icrp = 0x0d000000;
+        free_irq(66, dev);
 }
 #endif
 
@@ -1398,7 +1388,7 @@ mii_discover_phy(uint mii_reg, struct net_device *dev)
                 writel(0, fep->hwp + FEC_MII_SPEED);
                 fep->phy_speed = 0;
 #ifdef HAVE_mii_link_interrupt
-                fec_disable_phy_intr();
+                fec_disable_phy_intr(dev);
 #endif
         }
 }
@@ -1411,8 +1401,6 @@ mii_link_interrupt(int irq, void * dev_id)
         struct  net_device *dev = dev_id;
         struct fec_enet_private *fep = netdev_priv(dev);
 
-        fec_phy_ack_intr();
-
         mii_do_cmd(dev, fep->phy->ack_int);
         mii_do_cmd(dev, phy_cmd_relink);  /* restart and display status */