Merge branch 'for-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq

[~andy/linux] / drivers / net / wireless / hostap / hostap_cs.c

diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c
index 5441ad1951196ac9f791ae4c9e0ad57886c05e79..56cd01ca8ad0b15394017a8f298760e769ed8043 100644 (file)
--- a/drivers/net/wireless/hostap/hostap_cs.c
+++ b/drivers/net/wireless/hostap/hostap_cs.c
@@ -655,6 +655,9 @@ static const struct pcmcia_device_id hostap_cs_ids[] = {
        PCMCIA_DEVICE_PROD_ID123(
                "Addtron", "AWP-100 Wireless PCMCIA", "Version 01.02",
                0xe6ec52ce, 0x08649af2, 0x4b74baa0),
+       PCMCIA_DEVICE_PROD_ID123(
+               "Canon", "Wireless LAN CF Card K30225", "Version 01.00",
+               0x96ef6fe2, 0x263fcbab, 0xa57adb8c),
        PCMCIA_DEVICE_PROD_ID123(
                "D", "Link DWL-650 11Mbps WLAN Card", "Version 01.02",
                0x71b18589, 0xb6f1b0ab, 0x4b74baa0),
@@ -706,17 +709,4 @@ static struct pcmcia_driver hostap_driver = {
        .suspend        = hostap_cs_suspend,
        .resume         = hostap_cs_resume,
 };
-
-static int __init init_prism2_pccard(void)
-{
-       return pcmcia_register_driver(&hostap_driver);
-}
-
-static void __exit exit_prism2_pccard(void)
-{
-       pcmcia_unregister_driver(&hostap_driver);
-}
-
-
-module_init(init_prism2_pccard);
-module_exit(exit_prism2_pccard);
+module_pcmcia_driver(hostap_driver);