Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[pandora-kernel.git] / drivers / staging / brcm80211 / util / sbutils.c

diff --git a/drivers/staging/brcm80211/util/sbutils.c b/drivers/staging/brcm80211/util/sbutils.c
index e4c0bab..63c3ab1 100644 (file)
--- a/drivers/staging/brcm80211/util/sbutils.c
+++ b/drivers/staging/brcm80211/util/sbutils.c
@@ -16,6 +16,9 @@
 
 #include <linux/types.h>
 #include <bcmdefs.h>
+#ifdef BRCM_FULLMAC
+#include <linux/netdevice.h>
+#endif
 #include <osl.h>
 #include <bcmutils.h>
 #include <siutils.h>
@@ -87,7 +90,7 @@ static u32 _sb_coresba(si_info_t *sii)
 {
        u32 sbaddr = 0;
 
-       switch (BUSTYPE(sii->pub.bustype)) {
+       switch (sii->pub.bustype) {
        case SPI_BUS:
        case SDIO_BUS:
                sbaddr = (u32)(unsigned long)sii->curmap;
@@ -248,7 +251,7 @@ static uint _sb_scan(si_info_t *sii, u32 sba, void *regs, uint bus, u32 sbba,
                        else {
                                /* Older chips */
                                SI_ERROR(("sb_chip2numcores: unsupported chip "
-                                       "0x%x\n", CHIPID(sii->pub.chip)));
+                                                 "0x%x\n", sii->pub.chip));
                                ASSERT(0);
                                numcores = 1;
                        }
@@ -344,7 +347,7 @@ static void *_sb_setcoreidx(si_info_t *sii, uint coreidx)
        u32 sbaddr = sii->coresba[coreidx];
        void *regs;
 
-       switch (BUSTYPE(sii->pub.bustype)) {
+       switch (sii->pub.bustype) {
 #ifdef BCMSDIO
        case SPI_BUS:
        case SDIO_BUS:
@@ -409,8 +412,8 @@ bool sb_taclear(si_t *sih, bool details)
 
        sii = SI_INFO(sih);
 
-       if ((BUSTYPE(sii->pub.bustype) == SDIO_BUS) ||
-           (BUSTYPE(sii->pub.bustype) == SPI_BUS)) {
+       if ((sii->pub.bustype == SDIO_BUS) ||
+           (sii->pub.bustype == SPI_BUS)) {
 
                INTR_OFF(sii, intr_val);
                origidx = si_coreidx(sih);