Merge branch 'linus' into sched/urgent

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

diff --git a/drivers/net/wireless/atmel_pci.c b/drivers/net/wireless/atmel_pci.c
index a61b3bc6cccf4c94aac6bf57216d4389d055f61e..92f87fbe750ff170059bccf3ba75ced0c9d99654 100644 (file)
--- a/drivers/net/wireless/atmel_pci.c
+++ b/drivers/net/wireless/atmel_pci.c
@@ -19,7 +19,6 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 ******************************************************************************/
-#include <linux/config.h>
 #include <linux/pci.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
@@ -54,18 +53,18 @@ static int __devinit atmel_pci_probe(struct pci_dev *pdev,
                                     const struct pci_device_id *pent)
 {
        struct net_device *dev;
-               
+
        if (pci_enable_device(pdev))
                return -ENODEV;
-       
+
        pci_set_master(pdev);
-       
-       dev = init_atmel_card(pdev->irq, pdev->resource[1].start, 
+
+       dev = init_atmel_card(pdev->irq, pdev->resource[1].start,
                              ATMEL_FW_TYPE_506,
                              &pdev->dev, NULL, NULL);
        if (!dev)
                return -ENODEV;
-       
+
        pci_set_drvdata(pdev, dev);
        return 0;
 }
@@ -77,7 +76,7 @@ static void __devexit atmel_pci_remove(struct pci_dev *pdev)
 
 static int __init atmel_init_module(void)
 {
-       return pci_module_init(&atmel_driver);
+       return pci_register_driver(&atmel_driver);
 }
 
 static void __exit atmel_cleanup_module(void)