fedora core 6 1.2949 + vserver 2.2.0

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

diff --git a/drivers/net/wireless/atmel_pci.c b/drivers/net/wireless/atmel_pci.c
index d425c3c..92f87fb 100644 (file)
--- a/drivers/net/wireless/atmel_pci.c
+++ b/drivers/net/wireless/atmel_pci.c
@@ -53,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;
 }
@@ -76,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)