Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg...

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

diff --git a/drivers/net/wireless/hostap/hostap_plx.c b/drivers/net/wireless/hostap/hostap_plx.c
index f0fd5ecdb24dceb0f2ac8316afbbcbf17a875b85..cbf15d703201f15dc323bffcd9461fd974fb4e1f 100644 (file)
--- a/drivers/net/wireless/hostap/hostap_plx.c
+++ b/drivers/net/wireless/hostap/hostap_plx.c
@@ -23,7 +23,6 @@
 #include "hostap_wlan.h"
 
 
-static char *version = PRISM2_VERSION " (Jouni Malinen <j@w1.fi>)";
 static char *dev_info = "hostap_plx";
 
 
@@ -32,7 +31,6 @@ MODULE_DESCRIPTION("Support for Intersil Prism2-based 802.11 wireless LAN "
                   "cards (PLX).");
 MODULE_SUPPORTED_DEVICE("Intersil Prism2-based WLAN cards (PLX)");
 MODULE_LICENSE("GPL");
-MODULE_VERSION(PRISM2_VERSION);
 
 
 static int ignore_cis;
@@ -610,29 +608,23 @@ static void prism2_plx_remove(struct pci_dev *pdev)
 
 MODULE_DEVICE_TABLE(pci, prism2_plx_id_table);
 
-static struct pci_driver prism2_plx_drv_id = {
+static struct pci_driver prism2_plx_driver = {
        .name           = "hostap_plx",
        .id_table       = prism2_plx_id_table,
        .probe          = prism2_plx_probe,
        .remove         = prism2_plx_remove,
-       .suspend        = NULL,
-       .resume         = NULL,
-       .enable_wake    = NULL
 };
 
 
 static int __init init_prism2_plx(void)
 {
-       printk(KERN_INFO "%s: %s\n", dev_info, version);
-
-       return pci_register_driver(&prism2_plx_drv_id);
+       return pci_register_driver(&prism2_plx_driver);
 }
 
 
 static void __exit exit_prism2_plx(void)
 {
-       pci_unregister_driver(&prism2_plx_drv_id);
-       printk(KERN_INFO "%s: Driver unloaded\n", dev_info);
+       pci_unregister_driver(&prism2_plx_driver);
 }