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 a7fe4d5..92f87fb 100644 (file)
--- a/drivers/net/wireless/atmel_pci.c
+++ b/drivers/net/wireless/atmel_pci.c
@@ -19,12 +19,12 @@
     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>
 #include <linux/init.h>
 #include <linux/netdevice.h>
+#include "atmel.h"
 
 MODULE_AUTHOR("Simon Kelley");
 MODULE_DESCRIPTION("Support for Atmel at76c50x 802.11 wireless ethernet cards.");
@@ -40,9 +40,6 @@ MODULE_DEVICE_TABLE(pci, card_ids);
 
 static int atmel_pci_probe(struct pci_dev *, const struct pci_device_id *);
 static void atmel_pci_remove(struct pci_dev *);
-struct net_device *init_atmel_card(int, int, char *, struct device *, 
-                                  int (*present_func)(void *), void * );
-void stop_atmel_card( struct net_device *, int );
 
 static struct pci_driver atmel_driver = {
        .name     = "atmel",
@@ -56,30 +53,30 @@ 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, 
-                             "atmel_at76c506%s.bin",
+
+       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;
 }
 
 static void __devexit atmel_pci_remove(struct pci_dev *pdev)
 {
-       stop_atmel_card(pci_get_drvdata(pdev), 1);
+       stop_atmel_card(pci_get_drvdata(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)