Merge remote-tracking branch 'ipsec/master'

[karo-tx-linux.git] / drivers / net / wireless / b43 / main.c

diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index 28490702124a0da53bb2834f1ca880a452d6523b..ec013fbd6a81cda4a0cce04a74b469c1f3cda532 100644 (file)
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -56,7 +56,6 @@
 #include "sysfs.h"
 #include "xmit.h"
 #include "lo.h"
-#include "pcmcia.h"
 #include "sdio.h"
 #include <linux/mmc/sdio_func.h>
 
@@ -120,6 +119,7 @@ MODULE_PARM_DESC(allhwsupport, "Enable support for all hardware (even it if over
 #ifdef CONFIG_B43_BCMA
 static const struct bcma_device_id b43_bcma_tbl[] = {
        BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 0x11, BCMA_ANY_CLASS),
+       BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 0x15, BCMA_ANY_CLASS),
        BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 0x17, BCMA_ANY_CLASS),
        BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 0x18, BCMA_ANY_CLASS),
        BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 0x1C, BCMA_ANY_CLASS),
@@ -5849,12 +5849,9 @@ static int __init b43_init(void)
        int err;
 
        b43_debugfs_init();
-       err = b43_pcmcia_init();
-       if (err)
-               goto err_dfs_exit;
        err = b43_sdio_init();
        if (err)
-               goto err_pcmcia_exit;
+               goto err_dfs_exit;
 #ifdef CONFIG_B43_BCMA
        err = bcma_driver_register(&b43_bcma_driver);
        if (err)
@@ -5877,8 +5874,6 @@ err_bcma_driver_exit:
 err_sdio_exit:
 #endif
        b43_sdio_exit();
-err_pcmcia_exit:
-       b43_pcmcia_exit();
 err_dfs_exit:
        b43_debugfs_exit();
        return err;
@@ -5893,7 +5888,6 @@ static void __exit b43_exit(void)
        bcma_driver_unregister(&b43_bcma_driver);
 #endif
        b43_sdio_exit();
-       b43_pcmcia_exit();
        b43_debugfs_exit();
 }