5 files changed, 49 insertions, 33 deletions
diff --git a/backport/defconfigs/b43 b/backport/defconfigs/b43
index 96354eb9..dd2ba896 100644
--- a/backport/defconfigs/b43
+++ b/backport/defconfigs/b43
@@ -6,7 +6,6 @@ CPTCFG_MAC80211_LEDS=y
 CPTCFG_WLAN=y
 CPTCFG_B43=m
 CPTCFG_B43_BCMA=y
-CPTCFG_B43_BCMA_EXTRA=y
 CPTCFG_B43_PCMCIA=y
 CPTCFG_B43_SDIO=y
 CPTCFG_B43_PHY_N=y
diff --git a/backport/defconfigs/media b/backport/defconfigs/media
index cbaf99fa..d82229e2 100644
--- a/backport/defconfigs/media
+++ b/backport/defconfigs/media
@@ -43,7 +43,6 @@ CPTCFG_DVB_HOPPER=y
 CPTCFG_DVB_ISL6405=y
 CPTCFG_DVB_ISL6421=y
 CPTCFG_DVB_ISL6423=y
-CPTCFG_DVB_IT913X_FE=y
 CPTCFG_DVB_IX2505V=y
 CPTCFG_DVB_L64781=y
 CPTCFG_DVB_LG2160=y
@@ -132,7 +131,6 @@ CPTCFG_DVB_USB_EC168=y
 CPTCFG_DVB_USB_FRIIO=y
 CPTCFG_DVB_USB_GL861=y
 CPTCFG_DVB_USB_GP8PSK=y
-CPTCFG_DVB_USB_IT913X=y
 CPTCFG_DVB_USB_LME2510=y
 CPTCFG_DVB_USB_M920X=y
 CPTCFG_DVB_USB_MXL111SF=y
@@ -161,8 +159,8 @@ CPTCFG_IR_IMON=y
 CPTCFG_IR_ITE_CIR=y
 CPTCFG_IR_JVC_DECODER=y
 CPTCFG_IR_LIRC_CODEC=y
-CPTCFG_IR_MCE_KBD_DECODER=y
 CPTCFG_IR_MCEUSB=y
+CPTCFG_IR_MCE_KBD_DECODER=y
 CPTCFG_IR_NEC_DECODER=y
 CPTCFG_IR_NUVOTON=y
 CPTCFG_IR_RC5_DECODER=y
@@ -178,6 +176,14 @@ CPTCFG_IR_WINBOND_CIR=y
 CPTCFG_LIRC=y
 CPTCFG_MANTIS_CORE=y
 CPTCFG_MEDIA_ALTERA_CI=y
+CPTCFG_MEDIA_ANALOG_TV_SUPPORT=y
+CPTCFG_MEDIA_CAMERA_SUPPORT=y
+CPTCFG_MEDIA_CONTROLLER=y
+CPTCFG_MEDIA_DIGITAL_TV_SUPPORT=y
+CPTCFG_MEDIA_PARPORT_SUPPORT=y
+CPTCFG_MEDIA_PCI_SUPPORT=y
+CPTCFG_MEDIA_RADIO_SUPPORT=y
+CPTCFG_MEDIA_RC_SUPPORT=y
 CPTCFG_MEDIA_SUPPORT=y
 CPTCFG_MEDIA_TUNER_E4000=y
 CPTCFG_MEDIA_TUNER_FC0011=y
@@ -208,21 +214,23 @@ CPTCFG_MEDIA_TUNER_TUA9001=y
 CPTCFG_MEDIA_TUNER_XC2028=y
 CPTCFG_MEDIA_TUNER_XC4000=y
 CPTCFG_MEDIA_TUNER_XC5000=y
+CPTCFG_MEDIA_USB_SUPPORT=y
 CPTCFG_RADIO_AZTECH=y
 CPTCFG_RADIO_CADET=y
 CPTCFG_RADIO_GEMTEK=y
 CPTCFG_RADIO_ISA=y
 CPTCFG_RADIO_MAXIRADIO=y
 CPTCFG_RADIO_MIROPCM20=y
-CPTCFG_RADIO_RTRACK=y
 CPTCFG_RADIO_RTRACK2=y
+CPTCFG_RADIO_RTRACK=y
 CPTCFG_RADIO_SAA7706H=y
 CPTCFG_RADIO_SF16FMI=y
 CPTCFG_RADIO_SF16FMR2=y
-CPTCFG_RADIO_SHARK=y
 CPTCFG_RADIO_SHARK2=y
+CPTCFG_RADIO_SHARK=y
 CPTCFG_RADIO_SI470X=y
 CPTCFG_RADIO_SI4713=y
+CPTCFG_RADIO_SI476X=y
 CPTCFG_RADIO_TEA5764=y
 CPTCFG_RADIO_TEF6862=y
 CPTCFG_RADIO_TERRATEC=y
@@ -308,14 +316,25 @@ CPTCFG_USB_M5602=y
 CPTCFG_USB_MA901=y
 CPTCFG_USB_MR800=y
 CPTCFG_USB_PWC=y
+CPTCFG_USB_RAREMONO=y
 CPTCFG_USB_S2255=y
 CPTCFG_USB_SI470X=y
-CPTCFG_USB_SN9C102=y
+CPTCFG_USB_SI4713=y
 CPTCFG_USB_STKWEBCAM=y
 CPTCFG_USB_STV06XX=y
 CPTCFG_USB_VIDEO_CLASS=y
 CPTCFG_USB_ZR364XX=y
 CPTCFG_V4L2_MEM2MEM_DEV=y
+CPTCFG_VIDEOBUF2_CORE=y
+CPTCFG_VIDEOBUF2_DMA_CONTIG=y
+CPTCFG_VIDEOBUF2_DMA_SG=y
+CPTCFG_VIDEOBUF2_MEMOPS=y
+CPTCFG_VIDEOBUF2_VMALLOC=y
+CPTCFG_VIDEOBUF_DMA_CONTIG=y
+CPTCFG_VIDEOBUF_DMA_SG=y
+CPTCFG_VIDEOBUF_DVB=y
+CPTCFG_VIDEOBUF_GEN=y
+CPTCFG_VIDEOBUF_VMALLOC=y
 CPTCFG_VIDEO_AD9389B=y
 CPTCFG_VIDEO_ADP1653=y
 CPTCFG_VIDEO_ADV7170=y
@@ -337,16 +356,6 @@ CPTCFG_VIDEO_BT848=y
 CPTCFG_VIDEO_BT856=y
 CPTCFG_VIDEO_BT866=y
 CPTCFG_VIDEO_BTCX=y
-CPTCFG_VIDEOBUF2_CORE=y
-CPTCFG_VIDEOBUF2_DMA_CONTIG=y
-CPTCFG_VIDEOBUF2_DMA_SG=y
-CPTCFG_VIDEOBUF2_MEMOPS=y
-CPTCFG_VIDEOBUF2_VMALLOC=y
-CPTCFG_VIDEOBUF_DMA_CONTIG=y
-CPTCFG_VIDEOBUF_DMA_SG=y
-CPTCFG_VIDEOBUF_DVB=y
-CPTCFG_VIDEOBUF_GEN=y
-CPTCFG_VIDEOBUF_VMALLOC=y
 CPTCFG_VIDEO_BWQCAM=y
 CPTCFG_VIDEO_CAFE_CCIC=y
 CPTCFG_VIDEO_CODA=y
@@ -372,7 +381,6 @@ CPTCFG_VIDEO_CX88_DVB=y
 CPTCFG_VIDEO_CX88_MPEG=y
 CPTCFG_VIDEO_CX88_VP3054=y
 CPTCFG_VIDEO_DAVINCI_VPBE_DISPLAY=y
-CPTCFG_VIDEO_DAVINCI_VPIF=y
 CPTCFG_VIDEO_DAVINCI_VPIF_CAPTURE=y
 CPTCFG_VIDEO_DAVINCI_VPIF_DISPLAY=y
 CPTCFG_VIDEO_DEV=y
@@ -382,13 +390,13 @@ CPTCFG_VIDEO_EM28XX=y
 CPTCFG_VIDEO_EM28XX_ALSA=y
 CPTCFG_VIDEO_EM28XX_DVB=y
 CPTCFG_VIDEO_EM28XX_RC=y
+CPTCFG_VIDEO_EM28XX_V4L2=y
 CPTCFG_VIDEO_EXYNOS_FIMC_LITE=y
 CPTCFG_VIDEO_FB_IVTV=y
 CPTCFG_VIDEO_HDPVR=y
 CPTCFG_VIDEO_HEXIUM_GEMINI=y
 CPTCFG_VIDEO_HEXIUM_ORION=y
 CPTCFG_VIDEO_IR_I2C=y
-CPTCFG_VIDEO_ISIF=y
 CPTCFG_VIDEO_IVTV=y
 CPTCFG_VIDEO_IVTV_ALSA=y
 CPTCFG_VIDEO_KS0127=y
@@ -412,10 +420,8 @@ CPTCFG_VIDEO_MX3=y
 CPTCFG_VIDEO_MXB=y
 CPTCFG_VIDEO_NOON010PC30=y
 CPTCFG_VIDEO_OMAP1=y
-CPTCFG_VIDEO_OMAP2=y
 CPTCFG_VIDEO_OMAP2_VOUT=y
 CPTCFG_VIDEO_OMAP3=y
-CPTCFG_VIDEO_OMAP3_DEBUG=y
 CPTCFG_VIDEO_OV7640=y
 CPTCFG_VIDEO_OV7670=y
 CPTCFG_VIDEO_OV9650=y
@@ -443,7 +449,6 @@ CPTCFG_VIDEO_SAA717X=y
 CPTCFG_VIDEO_SAA7185=y
 CPTCFG_VIDEO_SAA7191=y
 CPTCFG_VIDEO_SAMSUNG_EXYNOS_GSC=y
-CPTCFG_VIDEO_SAMSUNG_S5P_FIMC=y
 CPTCFG_VIDEO_SAMSUNG_S5P_G2D=y
 CPTCFG_VIDEO_SAMSUNG_S5P_HDMI=y
 CPTCFG_VIDEO_SAMSUNG_S5P_HDMIPHY=y
@@ -462,7 +467,7 @@ CPTCFG_VIDEO_SMIAPP_PLL=y
 CPTCFG_VIDEO_SONY_BTF_MPX=y
 CPTCFG_VIDEO_SR030PC30=y
 CPTCFG_VIDEO_STK1160=y
-CPTCFG_VIDEO_TCM825X=y
+CPTCFG_VIDEO_STK1160_COMMON=y
 CPTCFG_VIDEO_TDA7432=y
 CPTCFG_VIDEO_TDA9840=y
 CPTCFG_VIDEO_TEA6415C=y
@@ -488,19 +493,21 @@ CPTCFG_VIDEO_UPD64031A=y
 CPTCFG_VIDEO_UPD64083=y
 CPTCFG_VIDEO_USBVISION=y
 CPTCFG_VIDEO_V4L2=y
-CPTCFG_VIDEO_V4L2_INT_DEVICE=y
 CPTCFG_VIDEO_VIA_CAMERA=y
 CPTCFG_VIDEO_VINO=y
 CPTCFG_VIDEO_VIU=y
 CPTCFG_VIDEO_VIVI=y
 CPTCFG_VIDEO_VP27SMPX=y
-CPTCFG_VIDEO_VPFE_CAPTURE=y
-CPTCFG_VIDEO_VPSS_SYSTEM=y
 CPTCFG_VIDEO_VPX3220=y
 CPTCFG_VIDEO_VS6624=y
 CPTCFG_VIDEO_W9966=y
 CPTCFG_VIDEO_WM8739=y
 CPTCFG_VIDEO_WM8775=y
 CPTCFG_VIDEO_ZORAN=y
+CPTCFG_VIDEO_ZORAN_AVS6EYES=y
+CPTCFG_VIDEO_ZORAN_BUZ=y
+CPTCFG_VIDEO_ZORAN_DC10=y
 CPTCFG_VIDEO_ZORAN_DC30=y
+CPTCFG_VIDEO_ZORAN_LML33=y
+CPTCFG_VIDEO_ZORAN_LML33R10=y
 CPTCFG_VIDEO_ZORAN_ZR36060=y
diff --git a/backport/defconfigs/nfc b/backport/defconfigs/nfc
index 999127f6..c00f10fd 100644
--- a/backport/defconfigs/nfc
+++ b/backport/defconfigs/nfc
@@ -1,11 +1,20 @@
 CPTCFG_NFC=m
-CPTCFG_NFC_NCI=m
+CPTCFG_NFC_DIGITAL=m
 CPTCFG_NFC_HCI=m
-CPTCFG_NFC_SHDLC=y
-CPTCFG_NFC_LLCP=y
+CPTCFG_NFC_MEI_PHY=m
+CPTCFG_NFC_MICROREAD=m
+CPTCFG_NFC_MICROREAD_I2C=m
+CPTCFG_NFC_MICROREAD_MEI=m
+CPTCFG_NFC_MRVL=m
+CPTCFG_NFC_MRVL_USB=m
+CPTCFG_NFC_NCI=m
+CPTCFG_NFC_NCI_SPI=y
 CPTCFG_NFC_PN533=m
-CPTCFG_NFC_WILINK=m
 CPTCFG_NFC_PN544=m
 CPTCFG_NFC_PN544_I2C=m
-CPTCFG_NFC_MICROREAD=m
-CPTCFG_NFC_MICROREAD_I2C=m
+CPTCFG_NFC_PN544_MEI=m
+CPTCFG_NFC_PORT100=m
+CPTCFG_NFC_SHDLC=y
+CPTCFG_NFC_SIM=m
+CPTCFG_NFC_TRF7970A=m
+CPTCFG_NFC_WILINK=m
diff --git a/backport/defconfigs/rtlwifi b/backport/defconfigs/rtlwifi
index d9b59582..20f22c6d 100644
--- a/backport/defconfigs/rtlwifi
+++ b/backport/defconfigs/rtlwifi
@@ -15,6 +15,7 @@ CPTCFG_RTL8192CE=m
 CPTCFG_RTL8192SE=m
 CPTCFG_RTL8192DE=m
 CPTCFG_RTL8723AE=m
+CPTCFG_RTL8723BE=m
 CPTCFG_RTL8188EE=m
 CPTCFG_RTL8192CU=m
 CPTCFG_RTL8192C_COMMON=m
diff --git a/backport/defconfigs/wifi b/backport/defconfigs/wifi
index e29b799d..52c6f8c8 100644
--- a/backport/defconfigs/wifi
+++ b/backport/defconfigs/wifi
@@ -42,7 +42,6 @@ CPTCFG_IWL4965=m
 CPTCFG_IWLDVM=m
 CPTCFG_IWLMVM=m
 CPTCFG_IWLWIFI=m
-CPTCFG_IWLWIFI_P2P=y
 CPTCFG_LIBERTAS_CS=m
 CPTCFG_LIBERTAS=m
 CPTCFG_LIBERTAS_MESH=y
@@ -91,6 +90,7 @@ CPTCFG_RTL8192CU=m
 CPTCFG_RTL8192DE=m
 CPTCFG_RTL8192SE=m
 CPTCFG_RTL8723AE=m
+CPTCFG_RTL8723BE=m
 CPTCFG_RTLWIFI=m
 CPTCFG_SSB=m
 CPTCFG_SSB_PCMCIAHOST=y