orinoco: allow driver to specify netdev_ops

[deliverable/linux.git] / drivers / net / wireless / orinoco / airport.c

diff --git a/drivers/net/wireless/orinoco/airport.c b/drivers/net/wireless/orinoco/airport.c
index c60df2c1aca305166313aa5f3fc0e60fd201f9ba..7dac5adb6c1c9e73689d817b6739d3ce8956ae86 100644 (file)
--- a/drivers/net/wireless/orinoco/airport.c
+++ b/drivers/net/wireless/orinoco/airport.c
@@ -195,7 +195,7 @@ airport_attach(struct macio_dev *mdev, const struct of_device_id *match)
        ssleep(1);
 
        /* Reset it before we get the interrupt */
-       hermes_init(hw);
+       hw->ops->init(hw);
 
        if (request_irq(card->irq, orinoco_interrupt, 0, DRIVER_NAME, priv)) {
                printk(KERN_ERR PFX "Couldn't get IRQ %d\n", card->irq);
@@ -210,7 +210,7 @@ airport_attach(struct macio_dev *mdev, const struct of_device_id *match)
        }
 
        /* Register an interface with the stack */
-       if (orinoco_if_add(priv, phys_addr, card->irq) != 0) {
+       if (orinoco_if_add(priv, phys_addr, card->irq, NULL) != 0) {
                printk(KERN_ERR PFX "orinoco_if_add() failed\n");
                goto failed;
        }