diff options
| -rw-r--r-- | backport/defconfigs/ar5523 | 2 | ||||
| -rw-r--r-- | backport/defconfigs/ath10k | 2 | ||||
| -rw-r--r-- | backport/defconfigs/ath5k | 2 | ||||
| -rw-r--r-- | backport/defconfigs/ath6kl | 2 | ||||
| -rw-r--r-- | backport/defconfigs/ath9k | 2 | ||||
| -rw-r--r-- | backport/defconfigs/ath9k-debug | 2 | ||||
| -rw-r--r-- | backport/defconfigs/b43 | 1 | ||||
| -rw-r--r-- | backport/defconfigs/b43legacy | 1 | ||||
| -rw-r--r-- | backport/defconfigs/brcmfmac | 1 | ||||
| -rw-r--r-- | backport/defconfigs/brcmsmac | 1 | ||||
| -rw-r--r-- | backport/defconfigs/carl9170 | 2 | ||||
| -rw-r--r-- | backport/defconfigs/cw1200 | 1 | ||||
| -rw-r--r-- | backport/defconfigs/iwlwifi | 1 | ||||
| -rw-r--r-- | backport/defconfigs/media | 5 | ||||
| -rw-r--r-- | backport/defconfigs/rtlwifi | 1 | ||||
| -rw-r--r-- | backport/defconfigs/wcn36xx | 2 | ||||
| -rw-r--r-- | backport/defconfigs/wifi | 18 | ||||
| -rw-r--r-- | backport/defconfigs/wil6210 | 2 |
18 files changed, 31 insertions, 17 deletions
diff --git a/backport/defconfigs/ar5523 b/backport/defconfigs/ar5523 index b218d9ab..101c3a26 100644 --- a/backport/defconfigs/ar5523 +++ b/backport/defconfigs/ar5523 @@ -4,5 +4,5 @@ CPTCFG_MAC80211=m CPTCFG_MAC80211_LEDS=y CPTCFG_MAC80211_MESH=y CPTCFG_WLAN=y -CPTCFG_ATH_CARDS=m +CPTCFG_WLAN_VENDOR_ATH=y CPTCFG_AR5523=m diff --git a/backport/defconfigs/ath10k b/backport/defconfigs/ath10k index c791c998..b7be6172 100644 --- a/backport/defconfigs/ath10k +++ b/backport/defconfigs/ath10k @@ -4,7 +4,7 @@ CPTCFG_MAC80211=m CPTCFG_MAC80211_LEDS=y CPTCFG_MAC80211_MESH=y CPTCFG_WLAN=y -CPTCFG_ATH_CARDS=m +CPTCFG_WLAN_VENDOR_ATH=y CPTCFG_ATH10K_PCI=m CPTCFG_ATH10K=m CPTCFG_ATH10K_DEBUG=y diff --git a/backport/defconfigs/ath5k b/backport/defconfigs/ath5k index df95c579..920c6c64 100644 --- a/backport/defconfigs/ath5k +++ b/backport/defconfigs/ath5k @@ -4,5 +4,5 @@ CPTCFG_MAC80211=m CPTCFG_MAC80211_LEDS=y CPTCFG_MAC80211_MESH=y CPTCFG_WLAN=y -CPTCFG_ATH_CARDS=m +CPTCFG_WLAN_VENDOR_ATH=y CPTCFG_ATH5K=m diff --git a/backport/defconfigs/ath6kl b/backport/defconfigs/ath6kl index a3721278..a1a1fdd3 100644 --- a/backport/defconfigs/ath6kl +++ b/backport/defconfigs/ath6kl @@ -1,7 +1,7 @@ CPTCFG_CFG80211=m CPTCFG_CFG80211_WEXT=y CPTCFG_WLAN=y -CPTCFG_ATH_CARDS=m +CPTCFG_WLAN_VENDOR_ATH=y CPTCFG_ATH6KL=m CPTCFG_ATH6KL_SDIO=m CPTCFG_ATH6KL_USB=m diff --git a/backport/defconfigs/ath9k b/backport/defconfigs/ath9k index 0e935ccd..c7097f9f 100644 --- a/backport/defconfigs/ath9k +++ b/backport/defconfigs/ath9k @@ -4,6 +4,6 @@ CPTCFG_MAC80211=m CPTCFG_MAC80211_LEDS=y CPTCFG_MAC80211_MESH=y CPTCFG_WLAN=y -CPTCFG_ATH_CARDS=m +CPTCFG_WLAN_VENDOR_ATH=y CPTCFG_ATH9K=m CPTCFG_ATH9K_HTC=m diff --git a/backport/defconfigs/ath9k-debug b/backport/defconfigs/ath9k-debug index b7baedd0..d9cf94fe 100644 --- a/backport/defconfigs/ath9k-debug +++ b/backport/defconfigs/ath9k-debug @@ -12,7 +12,7 @@ CPTCFG_MAC80211_HT_DEBUG=y CPTCFG_MAC80211_IBSS_DEBUG=y CPTCFG_MAC80211_PS_DEBUG=y CPTCFG_WLAN=y -CPTCFG_ATH_CARDS=m +CPTCFG_WLAN_VENDOR_ATH=y CPTCFG_ATH9K=m CPTCFG_ATH9K_HTC=m CPTCFG_ATH_DEBUG=y diff --git a/backport/defconfigs/b43 b/backport/defconfigs/b43 index 5001070a..27bfb9e2 100644 --- a/backport/defconfigs/b43 +++ b/backport/defconfigs/b43 @@ -4,6 +4,7 @@ CPTCFG_MAC80211=m CPTCFG_MAC80211_MESH=y CPTCFG_MAC80211_LEDS=y CPTCFG_WLAN=y +CPTCFG_WLAN_VENDOR_BROADCOM=y CPTCFG_B43=m CPTCFG_B43_BCMA=y CPTCFG_B43_SDIO=y diff --git a/backport/defconfigs/b43legacy b/backport/defconfigs/b43legacy index 9a7fbe97..71787081 100644 --- a/backport/defconfigs/b43legacy +++ b/backport/defconfigs/b43legacy @@ -4,6 +4,7 @@ CPTCFG_MAC80211=m CPTCFG_MAC80211_MESH=y CPTCFG_MAC80211_LEDS=y CPTCFG_WLAN=y +CPTCFG_WLAN_VENDOR_BROADCOM=y CPTCFG_B43LEGACY=m CPTCFG_SSB=m CPTCFG_SSB_PCIHOST=y diff --git a/backport/defconfigs/brcmfmac b/backport/defconfigs/brcmfmac index f4657c7e..0e940ce3 100644 --- a/backport/defconfigs/brcmfmac +++ b/backport/defconfigs/brcmfmac @@ -1,6 +1,7 @@ CPTCFG_CFG80211=m CPTCFG_CFG80211_WEXT=y CPTCFG_WLAN=y +CPTCFG_WLAN_VENDOR_BROADCOM=y CPTCFG_BRCMFMAC=m CPTCFG_BRCMFMAC_SDIO=y CPTCFG_BRCMFMAC_USB=y diff --git a/backport/defconfigs/brcmsmac b/backport/defconfigs/brcmsmac index e4ca0666..2c2edd23 100644 --- a/backport/defconfigs/brcmsmac +++ b/backport/defconfigs/brcmsmac @@ -3,6 +3,7 @@ CPTCFG_CFG80211_WEXT=y CPTCFG_MAC80211=m CPTCFG_MAC80211_LEDS=y CPTCFG_WLAN=y +CPTCFG_WLAN_VENDOR_BROADCOM=y CPTCFG_BRCMSMAC=m CPTCFG_BCMA=m CPTCFG_BCMA_HOST_PCI=y diff --git a/backport/defconfigs/carl9170 b/backport/defconfigs/carl9170 index cc94e37e..002e0f1d 100644 --- a/backport/defconfigs/carl9170 +++ b/backport/defconfigs/carl9170 @@ -4,5 +4,5 @@ CPTCFG_MAC80211=m CPTCFG_MAC80211_LEDS=y CPTCFG_MAC80211_MESH=y CPTCFG_WLAN=y -CPTCFG_ATH_CARDS=m +CPTCFG_WLAN_VENDOR_ATH=y CPTCFG_CARL9170=m diff --git a/backport/defconfigs/cw1200 b/backport/defconfigs/cw1200 index ba031439..b9dfd4b2 100644 --- a/backport/defconfigs/cw1200 +++ b/backport/defconfigs/cw1200 @@ -4,6 +4,7 @@ CPTCFG_MAC80211=m CPTCFG_MAC80211_LEDS=y CPTCFG_MAC80211_MESH=y CPTCFG_WLAN=y +CPTCFG_WLAN_VENDOR_ST=y CPTCFG_CW1200=m CPTCFG_CW1200_WLAN_SDIO=m CPTCFG_CW1200_WLAN_SPI=m diff --git a/backport/defconfigs/iwlwifi b/backport/defconfigs/iwlwifi index fe7c6c14..1c1acf31 100644 --- a/backport/defconfigs/iwlwifi +++ b/backport/defconfigs/iwlwifi @@ -9,6 +9,7 @@ CPTCFG_MAC80211=m CPTCFG_MAC80211_DEBUGFS=y CPTCFG_MAC80211_MESSAGE_TRACING=y CPTCFG_WLAN=y +CPTCFG_WLAN_VENDOR_INTEL=y CPTCFG_IWLWIFI=m CPTCFG_IWLDVM=m CPTCFG_IWLMVM=m diff --git a/backport/defconfigs/media b/backport/defconfigs/media index c8f2e4d0..a0445837 100644 --- a/backport/defconfigs/media +++ b/backport/defconfigs/media @@ -404,12 +404,8 @@ CPTCFG_VIDEO_MT9P031=m CPTCFG_VIDEO_MT9T001=m CPTCFG_VIDEO_MT9V011=m CPTCFG_VIDEO_MT9V032=m -CPTCFG_VIDEO_MX2=m -CPTCFG_VIDEO_MX2_EMMAPRP=m -CPTCFG_VIDEO_MX3=m CPTCFG_VIDEO_MXB=m CPTCFG_VIDEO_NOON010PC30=m -CPTCFG_VIDEO_OMAP1=m CPTCFG_VIDEO_OMAP2_VOUT=m CPTCFG_VIDEO_OMAP3=m CPTCFG_VIDEO_OV7640=m @@ -464,7 +460,6 @@ CPTCFG_VIDEO_TDA9840=m CPTCFG_VIDEO_TEA6415C=m CPTCFG_VIDEO_TEA6420=m CPTCFG_VIDEO_THS7303=m -CPTCFG_VIDEO_TIMBERDALE=m CPTCFG_VIDEO_TLV320AIC23B=m CPTCFG_VIDEO_TM6000=m CPTCFG_VIDEO_TM6000_ALSA=m diff --git a/backport/defconfigs/rtlwifi b/backport/defconfigs/rtlwifi index 121995d6..00cb4acd 100644 --- a/backport/defconfigs/rtlwifi +++ b/backport/defconfigs/rtlwifi @@ -9,6 +9,7 @@ CPTCFG_MAC80211=m CPTCFG_MAC80211_DEBUGFS=y CPTCFG_MAC80211_MESSAGE_TRACING=y CPTCFG_WLAN=y +CPTCFG_WLAN_VENDOR_REALTEK=y CPTCFG_RTLWIFI=m CPTCFG_RTLWIFI_DEBUG=y CPTCFG_RTL8192CE=m diff --git a/backport/defconfigs/wcn36xx b/backport/defconfigs/wcn36xx index 374eb11e..a0ed8097 100644 --- a/backport/defconfigs/wcn36xx +++ b/backport/defconfigs/wcn36xx @@ -8,6 +8,6 @@ CPTCFG_MAC80211=m CPTCFG_MAC80211_DEBUGFS=y CPTCFG_MAC80211_MESSAGE_TRACING=y CPTCFG_WLAN=y -CPTCFG_ATH_CARDS=m +CPTCFG_WLAN_VENDOR_ATH=y CPTCFG_WCN36XX=m CPTCFG_WCN36XX_DEBUGFS=y diff --git a/backport/defconfigs/wifi b/backport/defconfigs/wifi index 78d14532..4034bb13 100644 --- a/backport/defconfigs/wifi +++ b/backport/defconfigs/wifi @@ -11,7 +11,6 @@ CPTCFG_ATH6KL_SDIO=m CPTCFG_ATH6KL_USB=m CPTCFG_ATH9K_HTC=m CPTCFG_ATH9K=m -CPTCFG_ATH_CARDS=m CPTCFG_ATMEL=m CPTCFG_B43LEGACY=m CPTCFG_B43=m @@ -119,6 +118,19 @@ CPTCFG_WLAN=y CPTCFG_WLCORE=m CPTCFG_WLCORE_SDIO=m CPTCFG_WLCORE_SPI=m -CPTCFG_WL_MEDIATEK=y -CPTCFG_WL_TI=y +CPTCFG_WLAN_VENDOR_ADMTEK=y +CPTCFG_WLAN_VENDOR_ATH=y +CPTCFG_WLAN_VENDOR_ATMEL=y +CPTCFG_WLAN_VENDOR_BROADCOM=y +CPTCFG_WLAN_VENDOR_CISCO=y +CPTCFG_WLAN_VENDOR_INTEL=y +CPTCFG_WLAN_VENDOR_INTERSIL=y +CPTCFG_WLAN_VENDOR_MARVELL=y +CPTCFG_WLAN_VENDOR_MEDIATEK=y +CPTCFG_WLAN_VENDOR_RALINK=y +CPTCFG_WLAN_VENDOR_REALTEK=y +CPTCFG_WLAN_VENDOR_RSI=y +CPTCFG_WLAN_VENDOR_ST=y +CPTCFG_WLAN_VENDOR_TI=y +CPTCFG_WLAN_VENDOR_ZYDAS=y CPTCFG_ZD1211RW=m diff --git a/backport/defconfigs/wil6210 b/backport/defconfigs/wil6210 index 3fa29b8e..e449a691 100644 --- a/backport/defconfigs/wil6210 +++ b/backport/defconfigs/wil6210 @@ -1,5 +1,5 @@ CPTCFG_CFG80211=m CPTCFG_CFG80211_WEXT=y CPTCFG_WLAN=y -CPTCFG_ATH_CARDS=m +CPTCFG_WLAN_VENDOR_ATH=y CPTCFG_WIL6210=m |