Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

[linux-2.6-omap-h63xx.git] / drivers / net / wireless / airport.c

diff --git a/drivers/net/wireless/airport.c b/drivers/net/wireless/airport.c
index 7b321f7cf358d05b3656dfce2e918daa373ce39b..6f7eb9f59223b43ccdd25b4b6d60e7906a054eaa 100644 (file)
--- a/drivers/net/wireless/airport.c
+++ b/drivers/net/wireless/airport.c
@@ -14,7 +14,6 @@
 #define DRIVER_NAME "airport"
 #define PFX DRIVER_NAME ": "
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
@@ -150,7 +149,7 @@ static int airport_hard_reset(struct orinoco_private *priv)
        /* Vitally important.  If we don't do this it seems we get an
         * interrupt somewhere during the power cycle, since
         * hw_unavailable is already set it doesn't get ACKed, we get
-        * into an interrupt loop and the the PMU decides to turn us
+        * into an interrupt loop and the PMU decides to turn us
         * off. */
        disable_irq(dev->irq);
 
@@ -198,7 +197,6 @@ airport_attach(struct macio_dev *mdev, const struct of_device_id *match)
                return -EBUSY;
        }
 
-       SET_MODULE_OWNER(dev);
        SET_NETDEV_DEV(dev, &mdev->ofdev.dev);
 
        macio_set_drvdata(mdev, dev);