Merge branch 'at91-5.4-trunk/defconfig' into linux-5.4-at91

Author: cristibirsan

arch/arm/configs/at91_dt_defconfig

@@ -214,7 +214,7 @@ CONFIG_DMADEVICES=y
 CONFIG_AT_HDMAC=y
 CONFIG_AT_XDMAC=y
 CONFIG_STAGING=y
-CONFIG_WILC1000_SDIO=m
+CONFIG_WILC_SDIO=m
 CONFIG_MICROCHIP_PIT64B=y
 # CONFIG_IOMMU_SUPPORT is not set
 CONFIG_IIO=y

arch/arm/configs/sama5_defconfig

@@ -261,7 +261,7 @@ CONFIG_DMADEVICES=y
 CONFIG_AT_HDMAC=y
 CONFIG_AT_XDMAC=y
 CONFIG_STAGING=y
-CONFIG_WILC1000_SDIO=m
+CONFIG_WILC_SDIO=m
 # CONFIG_IOMMU_SUPPORT is not set
 CONFIG_IIO=y
 CONFIG_AT91_ADC=y