Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[pandora-kernel.git] / arch / ia64 / hp / sim / simeth.c

diff --git a/arch/ia64/hp/sim/simeth.c b/arch/ia64/hp/sim/simeth.c
index 440001e..a63218e 100644 (file)
--- a/arch/ia64/hp/sim/simeth.c
+++ b/arch/ia64/hp/sim/simeth.c
@@ -128,17 +128,6 @@ netdev_probe(char *name, unsigned char *ether)
 }
 
 
-static inline int
-netdev_connect(int irq)
-{
-       /* XXX Fix me
-        * this does not support multiple cards
-        * also no return value
-        */
-       ia64_ssc_connect_irq(NETWORK_INTR, irq);
-       return 0;
-}
-
 static inline int
 netdev_attach(int fd, int irq, unsigned int ipaddr)
 {
@@ -226,15 +215,13 @@ simeth_probe1(void)
                return err;
        }
 
-       if ((rc = assign_irq_vector(AUTO_ASSIGN)) < 0)
-               panic("%s: out of interrupt vectors!\n", __func__);
-       dev->irq = rc;
-
        /*
         * attach the interrupt in the simulator, this does enable interrupts
         * until a netdev_attach() is called
         */
-       netdev_connect(dev->irq);
+       if ((rc = hpsim_get_irq(NETWORK_INTR)) < 0)
+               panic("%s: out of interrupt vectors!\n", __func__);
+       dev->irq = rc;
 
        printk(KERN_INFO "%s: hosteth=%s simfd=%d, HwAddr=%pm, IRQ %d\n",
               dev->name, simeth_device, local->simfd, dev->dev_addr, dev->irq);