diff options
| author | Mattias Nissler <mnissler@google.com> | 2016-07-25 20:47:16 +0200 |
|---|---|---|
| committer | Mattias Nissler <mnissler@google.com> | 2016-07-25 20:47:16 +0200 |
| commit | d8c5fca5da707e5caf43ce71384328a77d5a81a6 (patch) | |
| tree | 8c58923a302b4b174b51ad10bae9b688c04e6545 | |
| parent | 2badfb6de382de691f742ada4230b789eb0e651f (diff) | |
| download | v4.4-d8c5fca5da707e5caf43ce71384328a77d5a81a6.tar.gz | |
VENDOR: broadcom: bcmdhd: Use sdio_reset_comm from common kernel
A proper definition of sdio_reset_comm() was brought in when merging
Android-specific common kernel changes into Brillo's common kernel. We
can now the hack compile fix hack in bcmsdh_sdmmc.c.
Bug: 25923642
Patchset: wlan0 up on kylin board, iw is normal connect the AP.
Signed-off-by: Mattias Nissler <mnissler@google.com>
Change-Id: I7fea434b7f173b25acab2942eba106c2da542457
| -rw-r--r-- | drivers/net/wireless/bcmdhd/bcmsdh_sdmmc.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/net/wireless/bcmdhd/bcmsdh_sdmmc.c b/drivers/net/wireless/bcmdhd/bcmsdh_sdmmc.c index 04a3e0dee971..199522ef4840 100644 --- a/drivers/net/wireless/bcmdhd/bcmsdh_sdmmc.c +++ b/drivers/net/wireless/bcmdhd/bcmsdh_sdmmc.c @@ -62,14 +62,7 @@ static void IRQHandler(struct sdio_func *func); static void IRQHandlerF2(struct sdio_func *func); #endif /* !defined(OOB_INTR_ONLY) */ static int sdioh_sdmmc_get_cisaddr(sdioh_info_t *sd, uint32 regaddr); -#if 0 extern int sdio_reset_comm(struct mmc_card *card); -#else -int sdio_reset_comm(struct mmc_card *card) -{ - return 0; -} -#endif #define DEFAULT_SDIO_F2_BLKSIZE 512 #ifndef CUSTOM_SDIO_F2_BLKSIZE |