diff options
Diffstat (limited to 'drivers/net/wireless/marvell/mwifiex')
-rw-r--r-- | drivers/net/wireless/marvell/mwifiex/Kconfig | 3 | ||||
-rw-r--r-- | drivers/net/wireless/marvell/mwifiex/pcie.c | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/wireless/marvell/mwifiex/Kconfig b/drivers/net/wireless/marvell/mwifiex/Kconfig index b37a20c..a8abf60 100644 --- a/drivers/net/wireless/marvell/mwifiex/Kconfig +++ b/drivers/net/wireless/marvell/mwifiex/Kconfig @@ -1,5 +1,4 @@ config MWIFIEX - depends on !KERNEL_3_18 tristate "Marvell WiFi-Ex Driver" depends on m depends on CFG80211 @@ -11,7 +10,6 @@ config MWIFIEX mwifiex. config MWIFIEX_SDIO - depends on !KERNEL_3_2 tristate "Marvell WiFi-Ex Driver for SD8786/SD8787/SD8797/SD8887/SD8897/SD8997" depends on m depends on MWIFIEX && MMC @@ -25,7 +23,6 @@ config MWIFIEX_SDIO mwifiex_sdio. config MWIFIEX_PCIE - depends on !KERNEL_3_16 tristate "Marvell WiFi-Ex Driver for PCIE 8766/8897/8997" depends on m depends on MWIFIEX && PCI diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c index d9dc117..8b20ba0 100644 --- a/drivers/net/wireless/marvell/mwifiex/pcie.c +++ b/drivers/net/wireless/marvell/mwifiex/pcie.c @@ -415,7 +415,7 @@ struct pci_error_handlers mwifiex_pcie_err_handler = { #if LINUX_VERSION_IS_GEQ(4,13,0) .reset_prepare = mwifiex_pcie_reset_prepare, .reset_done = mwifiex_pcie_reset_done, -#else +#elif LINUX_VERSION_IS_GEQ(3,16,0) .reset_notify = mwifiex_pcie_reset_prepare_notify, #endif }; |