[3/3] UBUNTU: [Config] config sync wrt master/generic =m

diff --git a/debian.raspi2/config/config.common.ubuntu b/debian.raspi2/config/config.common.ubuntu
index 12bdceb..a69e4d3 100644
--- a/debian.raspi2/config/config.common.ubuntu
+++ b/debian.raspi2/config/config.common.ubuntu
@@ -29,7 +29,7 @@  CONFIG_9P_FSCACHE=y
 CONFIG_9P_FS_POSIX_ACL=y
 CONFIG_9P_FS_SECURITY=y
 CONFIG_AB3100_CORE=y
-CONFIG_AB3100_OTP=y
+CONFIG_AB3100_OTP=m
 CONFIG_ABX500_CORE=y
 CONFIG_AC97_BUS=y
 # CONFIG_ACCESSIBILITY is not set
@@ -414,7 +414,7 @@  CONFIG_AUFS_SBILIST=y
 # CONFIG_AUFS_SHWH is not set
 CONFIG_AUFS_XATTR=y
 CONFIG_AURORA_NB8800=m
-CONFIG_AUTOFS4_FS=y
+CONFIG_AUTOFS4_FS=m
 CONFIG_AUTO_ZRELADDR=y
 CONFIG_AUXDISPLAY=y
 CONFIG_AX25=m
@@ -547,7 +547,7 @@  CONFIG_BCM_VC_SM=y
 CONFIG_BEFS_FS=m
 CONFIG_BFS_FS=m
 CONFIG_BH1750=m
-# CONFIG_BH1780 is not set
+CONFIG_BH1780=m
 CONFIG_BIG_KEYS=y
 # CONFIG_BIG_LITTLE is not set
 CONFIG_BINARY_PRINTF=y
@@ -705,7 +705,7 @@  CONFIG_BUG=y
 CONFIG_BUILDTIME_EXTABLE_SORT=y
 CONFIG_BUILD_BIN2C=y
 CONFIG_C2PORT=m
-CONFIG_CACHEFILES=y
+CONFIG_CACHEFILES=m
 # CONFIG_CACHEFILES_DEBUG is not set
 # CONFIG_CACHEFILES_HISTOGRAM is not set
 # CONFIG_CACHE_L2X0 is not set
@@ -989,7 +989,7 @@  CONFIG_CRC32_SLICEBY8=y
 CONFIG_CRC7=m
 CONFIG_CRC8=m
 CONFIG_CRC_CCITT=y
-CONFIG_CRC_ITU_T=y
+CONFIG_CRC_ITU_T=m
 CONFIG_CRC_T10DIF=y
 CONFIG_CROSS_COMPILE=""
 CONFIG_CROSS_MEMORY_ATTACH=y
@@ -1025,14 +1025,14 @@  CONFIG_CRYPTO_CCM=m
 CONFIG_CRYPTO_CHACHA20=m
 CONFIG_CRYPTO_CHACHA20POLY1305=m
 CONFIG_CRYPTO_CMAC=m
-CONFIG_CRYPTO_CRC32=y
+CONFIG_CRYPTO_CRC32=m
 CONFIG_CRYPTO_CRC32C=y
 CONFIG_CRYPTO_CRCT10DIF=y
 CONFIG_CRYPTO_CRYPTD=m
 CONFIG_CRYPTO_CTR=y
 CONFIG_CRYPTO_CTS=y
 CONFIG_CRYPTO_DEFLATE=m
-CONFIG_CRYPTO_DES=y
+CONFIG_CRYPTO_DES=m
 # CONFIG_CRYPTO_DEV_CCP is not set
 CONFIG_CRYPTO_DH=m
 CONFIG_CRYPTO_DRBG=y
@@ -1538,7 +1538,7 @@  CONFIG_EZCHIP_NPS_MANAGEMENT_ENET=m
 CONFIG_EZX_PCAP=y
 # CONFIG_F2FS_CHECK_FS is not set
 # CONFIG_F2FS_FAULT_INJECTION is not set
-CONFIG_F2FS_FS=y
+CONFIG_F2FS_FS=m
 CONFIG_F2FS_FS_ENCRYPTION=y
 CONFIG_F2FS_FS_POSIX_ACL=y
 CONFIG_F2FS_FS_SECURITY=y
@@ -1668,7 +1668,7 @@  CONFIG_FRAME_VECTOR=y
 CONFIG_FRAME_WARN=1024
 CONFIG_FREEZER=y
 CONFIG_FRONTSWAP=y
-CONFIG_FSCACHE=y
+CONFIG_FSCACHE=m
 # CONFIG_FSCACHE_DEBUG is not set
 CONFIG_FSCACHE_HISTOGRAM=y
 # CONFIG_FSCACHE_OBJECT_LIST is not set
@@ -1811,7 +1811,7 @@  CONFIG_GPIO_WM8994=m
 # CONFIG_GPIO_XILINX is not set
 CONFIG_GPIO_ZEVIO=y
 CONFIG_GPIO_ZX=y
-CONFIG_GRACE_PERIOD=y
+CONFIG_GRACE_PERIOD=m
 CONFIG_GREENASIA_FF=y
 CONFIG_GS_FPGABOOT=m
 CONFIG_GTP=m
@@ -2207,16 +2207,16 @@  CONFIG_IMA_READ_POLICY=y
 CONFIG_IMA_TRUSTED_KEYRING=y
 CONFIG_IMA_WRITE_POLICY=y
 CONFIG_IMX_THERMAL=m
-# CONFIG_INA2XX_ADC is not set
+CONFIG_INA2XX_ADC=m
 CONFIG_INET=y
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
 CONFIG_INET6_IPCOMP=m
-CONFIG_INET6_TUNNEL=y
-CONFIG_INET6_XFRM_MODE_BEET=y
+CONFIG_INET6_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_BEET=m
 CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
-CONFIG_INET6_XFRM_MODE_TRANSPORT=y
-CONFIG_INET6_XFRM_MODE_TUNNEL=y
+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
+CONFIG_INET6_XFRM_MODE_TUNNEL=m
 CONFIG_INET6_XFRM_TUNNEL=m
 CONFIG_INET_AH=m
 CONFIG_INET_DCCP_DIAG=m
@@ -2226,7 +2226,7 @@  CONFIG_INET_ESP=m
 CONFIG_INET_IPCOMP=m
 CONFIG_INET_SCTP_DIAG=m
 CONFIG_INET_TCP_DIAG=m
-CONFIG_INET_TUNNEL=y
+CONFIG_INET_TUNNEL=m
 CONFIG_INET_UDP_DIAG=m
 CONFIG_INET_XFRM_MODE_BEET=m
 CONFIG_INET_XFRM_MODE_TRANSPORT=m
@@ -2279,7 +2279,7 @@  CONFIG_INPUT_KEYBOARD=y
 CONFIG_INPUT_KEYSPAN_REMOTE=m
 CONFIG_INPUT_KXTJ9=m
 # CONFIG_INPUT_KXTJ9_POLLED_MODE is not set
-CONFIG_INPUT_LEDS=y
+CONFIG_INPUT_LEDS=m
 CONFIG_INPUT_MATRIXKMAP=m
 CONFIG_INPUT_MAX77693_HAPTIC=m
 CONFIG_INPUT_MAX8925_ONKEY=m
@@ -2328,7 +2328,7 @@  CONFIG_INTEL_TH_GTH=m
 CONFIG_INTEL_TH_MSU=m
 CONFIG_INTEL_TH_PTI=m
 CONFIG_INTEL_TH_STH=m
-# CONFIG_INTEL_XWAY_PHY is not set
+CONFIG_INTEL_XWAY_PHY=m
 CONFIG_INTERVAL_TREE=y
 CONFIG_INTERVAL_TREE_TEST=m
 CONFIG_INV_MPU6050_I2C=m
@@ -2378,8 +2378,8 @@  CONFIG_IPMI_SSIF=m
 CONFIG_IPMI_WATCHDOG=m
 CONFIG_IPPP_FILTER=y
 CONFIG_IPV6=y
-CONFIG_IPV6_FOU=y
-CONFIG_IPV6_FOU_TUNNEL=y
+CONFIG_IPV6_FOU=m
+CONFIG_IPV6_FOU_TUNNEL=m
 CONFIG_IPV6_GRE=m
 CONFIG_IPV6_ILA=m
 CONFIG_IPV6_MIP6=m
@@ -2391,10 +2391,10 @@  CONFIG_IPV6_NDISC_NODETYPE=y
 CONFIG_IPV6_PIMSM_V2=y
 CONFIG_IPV6_ROUTER_PREF=y
 CONFIG_IPV6_ROUTE_INFO=y
-CONFIG_IPV6_SIT=y
+CONFIG_IPV6_SIT=m
 CONFIG_IPV6_SIT_6RD=y
 CONFIG_IPV6_SUBTREES=y
-CONFIG_IPV6_TUNNEL=y
+CONFIG_IPV6_TUNNEL=m
 CONFIG_IPV6_VTI=m
 CONFIG_IPVLAN=m
 CONFIG_IPX=m
@@ -2776,7 +2776,7 @@  CONFIG_LIB80211_CRYPT_CCMP=m
 CONFIG_LIB80211_CRYPT_TKIP=m
 CONFIG_LIB80211_CRYPT_WEP=m
 # CONFIG_LIB80211_DEBUG is not set
-CONFIG_LIBCRC32C=y
+CONFIG_LIBCRC32C=m
 CONFIG_LIBERTAS=m
 # CONFIG_LIBERTAS_DEBUG is not set
 CONFIG_LIBERTAS_MESH=y
@@ -2810,7 +2810,7 @@  CONFIG_LNET_MAX_PAYLOAD=1048576
 CONFIG_LNET_SELFTEST=m
 CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_LOCKD=y
+CONFIG_LOCKD=m
 CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_LOCKD_V4=y
 CONFIG_LOCKUP_DETECTOR=y
@@ -3162,7 +3162,7 @@  CONFIG_MOUSE_ELAN_I2C=m
 CONFIG_MOUSE_ELAN_I2C_I2C=y
 # CONFIG_MOUSE_ELAN_I2C_SMBUS is not set
 CONFIG_MOUSE_GPIO=m
-CONFIG_MOUSE_PS2=y
+CONFIG_MOUSE_PS2=m
 CONFIG_MOUSE_PS2_ALPS=y
 CONFIG_MOUSE_PS2_BYD=y
 CONFIG_MOUSE_PS2_CYPRESS=y
@@ -3470,7 +3470,7 @@  CONFIG_NET_EMATCH_STACK=32
 CONFIG_NET_EMATCH_TEXT=m
 CONFIG_NET_EMATCH_U32=m
 CONFIG_NET_FLOW_LIMIT=y
-CONFIG_NET_FOU=y
+CONFIG_NET_FOU=m
 CONFIG_NET_FOU_IP_TUNNELS=y
 CONFIG_NET_IFE_SKBMARK=m
 CONFIG_NET_IFE_SKBPRIO=m
@@ -3480,7 +3480,7 @@  CONFIG_NET_IPGRE_BROADCAST=y
 CONFIG_NET_IPGRE_DEMUX=m
 CONFIG_NET_IPIP=m
 CONFIG_NET_IPVTI=m
-CONFIG_NET_IP_TUNNEL=y
+CONFIG_NET_IP_TUNNEL=m
 CONFIG_NET_KEY=m
 # CONFIG_NET_KEY_MIGRATE is not set
 CONFIG_NET_L3_MASTER_DEV=y
@@ -3527,7 +3527,7 @@  CONFIG_NET_TEAM_MODE_BROADCAST=m
 CONFIG_NET_TEAM_MODE_LOADBALANCE=m
 CONFIG_NET_TEAM_MODE_RANDOM=m
 CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
-CONFIG_NET_UDP_TUNNEL=y
+CONFIG_NET_UDP_TUNNEL=m
 CONFIG_NET_VENDOR_8390=y
 CONFIG_NET_VENDOR_AMAZON=y
 CONFIG_NET_VENDOR_AMD=y
@@ -3603,18 +3603,18 @@  CONFIG_NFSD_V3=y
 CONFIG_NFSD_V3_ACL=y
 CONFIG_NFSD_V4=y
 CONFIG_NFSD_V4_SECURITY_LABEL=y
-CONFIG_NFS_ACL_SUPPORT=y
+CONFIG_NFS_ACL_SUPPORT=m
 CONFIG_NFS_COMMON=y
 CONFIG_NFS_DEBUG=y
-CONFIG_NFS_FS=y
+CONFIG_NFS_FS=m
 CONFIG_NFS_FSCACHE=y
 CONFIG_NFS_SWAP=y
 CONFIG_NFS_USE_KERNEL_DNS=y
 # CONFIG_NFS_USE_LEGACY_DNS is not set
-CONFIG_NFS_V2=y
-CONFIG_NFS_V3=y
+CONFIG_NFS_V2=m
+CONFIG_NFS_V3=m
 CONFIG_NFS_V3_ACL=y
-CONFIG_NFS_V4=y
+CONFIG_NFS_V4=m
 CONFIG_NFS_V4_1=y
 CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
 CONFIG_NFS_V4_1_MIGRATION=y
@@ -3726,7 +3726,7 @@  CONFIG_NILFS2_FS=m
 CONFIG_NLATTR=y
 CONFIG_NLMON=m
 CONFIG_NLS=y
-CONFIG_NLS_ASCII=y
+CONFIG_NLS_ASCII=m
 CONFIG_NLS_CODEPAGE_1250=m
 CONFIG_NLS_CODEPAGE_1251=m
 CONFIG_NLS_CODEPAGE_437=y
@@ -3968,8 +3968,8 @@  CONFIG_PM_STD_PARTITION=""
 CONFIG_PM_WAKELOCKS=y
 CONFIG_PM_WAKELOCKS_GC=y
 CONFIG_PM_WAKELOCKS_LIMIT=100
-CONFIG_PNFS_BLOCK=y
-CONFIG_PNFS_FILE_LAYOUT=y
+CONFIG_PNFS_BLOCK=m
+CONFIG_PNFS_FILE_LAYOUT=m
 CONFIG_PNFS_FLEXFILE_LAYOUT=m
 CONFIG_PNFS_OBJLAYOUT=m
 CONFIG_POSIX_MQUEUE=y
@@ -4053,11 +4053,11 @@  CONFIG_PWM_STMPE=y
 CONFIG_PWM_SYSFS=y
 CONFIG_PWM_TWL=m
 CONFIG_PWM_TWL_LED=m
-CONFIG_PWRSEQ_EMMC=y
-CONFIG_PWRSEQ_SIMPLE=y
+CONFIG_PWRSEQ_EMMC=m
+CONFIG_PWRSEQ_SIMPLE=m
 CONFIG_QCA7000=m
-# CONFIG_QCOM_HIDMA is not set
-# CONFIG_QCOM_HIDMA_MGMT is not set
+CONFIG_QCOM_HIDMA=m
+CONFIG_QCOM_HIDMA_MGMT=m
 CONFIG_QCOM_SPMI_IADC=m
 CONFIG_QCOM_SPMI_TEMP_ALARM=m
 CONFIG_QCOM_SPMI_VADC=m
@@ -4097,13 +4097,13 @@  CONFIG_RAS=y
 CONFIG_RASPBERRYPI_FIRMWARE=y
 CONFIG_RASPBERRYPI_POWER=y
 CONFIG_RATIONAL=y
-CONFIG_RAW_DRIVER=y
+CONFIG_RAW_DRIVER=m
 CONFIG_RBTREE_TEST=m
 CONFIG_RCU_CPU_STALL_TIMEOUT=21
 # CONFIG_RCU_EQS_DEBUG is not set
 # CONFIG_RCU_EXPEDITE_BOOT is not set
 # CONFIG_RCU_EXPERT is not set
-# CONFIG_RCU_PERF_TEST is not set
+CONFIG_RCU_PERF_TEST=m
 CONFIG_RCU_STALL_COMMON=y
 # CONFIG_RCU_TORTURE_TEST is not set
 # CONFIG_RCU_TRACE is not set
@@ -4140,7 +4140,7 @@  CONFIG_REGULATOR=y
 CONFIG_REGULATOR_88PM800=m
 CONFIG_REGULATOR_88PM8607=m
 CONFIG_REGULATOR_AAT2870=m
-CONFIG_REGULATOR_AB3100=y
+CONFIG_REGULATOR_AB3100=m
 CONFIG_REGULATOR_ACT8865=m
 CONFIG_REGULATOR_ACT8945A=m
 CONFIG_REGULATOR_AD5398=m
@@ -4262,7 +4262,6 @@  CONFIG_ROMFS_BACKED_BY_BLOCK=y
 # CONFIG_ROMFS_BACKED_BY_MTD is not set
 CONFIG_ROMFS_FS=m
 CONFIG_ROMFS_ON_BLOCK=y
-CONFIG_ROOT_NFS=y
 CONFIG_ROSE=m
 CONFIG_RPCSEC_GSS_KRB5=m
 CONFIG_RPR0521=m
@@ -4293,7 +4292,7 @@  CONFIG_RTC_CLASS=y
 # CONFIG_RTC_DEBUG is not set
 CONFIG_RTC_DRV_88PM80X=m
 CONFIG_RTC_DRV_88PM860X=m
-CONFIG_RTC_DRV_AB3100=y
+CONFIG_RTC_DRV_AB3100=m
 CONFIG_RTC_DRV_ABB5ZES3=m
 CONFIG_RTC_DRV_ABX80X=m
 CONFIG_RTC_DRV_AS3722=m
@@ -4453,7 +4452,7 @@  CONFIG_SCSI_ENCLOSURE=m
 CONFIG_SCSI_FC_ATTRS=m
 # CONFIG_SCSI_HISI_SAS is not set
 CONFIG_SCSI_IMM=m
-CONFIG_SCSI_ISCSI_ATTRS=y
+CONFIG_SCSI_ISCSI_ATTRS=m
 # CONFIG_SCSI_IZIP_EPP16 is not set
 # CONFIG_SCSI_IZIP_SLOW_CTR is not set
 CONFIG_SCSI_LOGGING=y
@@ -4964,8 +4963,8 @@  CONFIG_SND_SOC_WM8985=m
 CONFIG_SND_SOC_XTFPGA_I2S=m
 CONFIG_SND_SPI=y
 CONFIG_SND_SUN4I_CODEC=m
-# CONFIG_SND_SUN4I_I2S is not set
-# CONFIG_SND_SUN4I_SPDIF is not set
+CONFIG_SND_SUN4I_I2S=m
+CONFIG_SND_SUN4I_SPDIF=m
 CONFIG_SND_SUPPORT_OLD_API=y
 CONFIG_SND_TIMER=y
 CONFIG_SND_USB=y
@@ -5031,13 +5030,13 @@  CONFIG_SPEAKUP_SYNTH_SPKOUT=m
 CONFIG_SPEAKUP_SYNTH_TXPRT=m
 CONFIG_SPI=y
 CONFIG_SPI_ALTERA=m
-# CONFIG_SPI_AXI_SPI_ENGINE is not set
+CONFIG_SPI_AXI_SPI_ENGINE=m
 CONFIG_SPI_BCM2835=m
 CONFIG_SPI_BCM2835AUX=m
 CONFIG_SPI_BITBANG=m
 CONFIG_SPI_BUTTERFLY=m
 CONFIG_SPI_CADENCE=m
-# CONFIG_SPI_CADENCE_QUADSPI is not set
+CONFIG_SPI_CADENCE_QUADSPI=m
 # CONFIG_SPI_DEBUG is not set
 CONFIG_SPI_DESIGNWARE=m
 CONFIG_SPI_DLN2=m
@@ -5046,7 +5045,7 @@  CONFIG_SPI_FSL_LIB=y
 CONFIG_SPI_FSL_SPI=y
 CONFIG_SPI_GPIO=m
 CONFIG_SPI_LM70_LLP=m
-# CONFIG_SPI_LOOPBACK_TEST is not set
+CONFIG_SPI_LOOPBACK_TEST=m
 CONFIG_SPI_MASTER=y
 CONFIG_SPI_OC_TINY=m
 CONFIG_SPI_PL022=m
@@ -5105,14 +5104,14 @@  CONFIG_STMPE_I2C=y
 CONFIG_STMPE_SPI=y
 CONFIG_STM_DUMMY=m
 CONFIG_STM_SOURCE_CONSOLE=m
-# CONFIG_STM_SOURCE_HEARTBEAT is not set
+CONFIG_STM_SOURCE_HEARTBEAT=m
 CONFIG_STP=m
 CONFIG_STRICT_DEVMEM=y
 # CONFIG_STRIP_ASM_SYMS is not set
-CONFIG_SUNRPC=y
+CONFIG_SUNRPC=m
 CONFIG_SUNRPC_BACKCHANNEL=y
 CONFIG_SUNRPC_DEBUG=y
-CONFIG_SUNRPC_GSS=y
+CONFIG_SUNRPC_GSS=m
 CONFIG_SUNRPC_SWAP=y
 # CONFIG_SUNXI_CCU is not set
 # CONFIG_SUNXI_SRAM is not set
@@ -5157,25 +5156,26 @@  CONFIG_TABLET_USB_AIPTEK=m
 CONFIG_TABLET_USB_GTCO=m
 CONFIG_TABLET_USB_HANWANG=m
 CONFIG_TABLET_USB_KBTAB=m
-# CONFIG_TABLET_USB_PEGASUS is not set
+CONFIG_TABLET_USB_PEGASUS=m
 CONFIG_TAHVO_USB=m
 CONFIG_TAHVO_USB_HOST_BY_DEFAULT=y
 CONFIG_TARGET_CORE=m
 CONFIG_TASKSTATS=y
-# CONFIG_TASKS_RCU is not set
+CONFIG_TASKS_RCU=y
 CONFIG_TASK_DELAY_ACCT=y
 CONFIG_TASK_IO_ACCOUNTING=y
 CONFIG_TASK_XACCT=y
 CONFIG_TCG_ATMEL=m
+CONFIG_TCG_TIS_CORE=m
 CONFIG_TCG_TIS_I2C_ATMEL=m
 CONFIG_TCG_TIS_I2C_INFINEON=m
 CONFIG_TCG_TIS_I2C_NUVOTON=m
-# CONFIG_TCG_TIS_SPI is not set
+CONFIG_TCG_TIS_SPI=m
 CONFIG_TCG_TIS_ST33ZP24=m
 CONFIG_TCG_TIS_ST33ZP24_I2C=m
 CONFIG_TCG_TIS_ST33ZP24_SPI=m
 CONFIG_TCG_TPM=y
-# CONFIG_TCG_VTPM_PROXY is not set
+CONFIG_TCG_VTPM_PROXY=m
 CONFIG_TCM_FC=m
 CONFIG_TCM_FILEIO=m
 CONFIG_TCM_IBLOCK=m
@@ -5191,7 +5191,7 @@  CONFIG_TCP_CONG_HTCP=m
 CONFIG_TCP_CONG_HYBLA=m
 CONFIG_TCP_CONG_ILLINOIS=m
 CONFIG_TCP_CONG_LP=m
-# CONFIG_TCP_CONG_NV is not set
+CONFIG_TCP_CONG_NV=m
 CONFIG_TCP_CONG_SCALABLE=m
 CONFIG_TCP_CONG_VEGAS=m
 CONFIG_TCP_CONG_VENO=m
@@ -5205,7 +5205,7 @@  CONFIG_TERANETICS_PHY=m
 # CONFIG_TEST_BITMAP is not set
 CONFIG_TEST_BPF=m
 CONFIG_TEST_FIRMWARE=m
-# CONFIG_TEST_HASH is not set
+CONFIG_TEST_HASH=m
 CONFIG_TEST_HEXDUMP=m
 CONFIG_TEST_KSTRTOX=m
 # CONFIG_TEST_LIST_SORT is not set
@@ -5217,7 +5217,7 @@  CONFIG_TEST_STATIC_KEYS=m
 CONFIG_TEST_STRING_HELPERS=m
 CONFIG_TEST_UDELAY=m
 CONFIG_TEST_USER_COPY=m
-# CONFIG_TEST_UUID is not set
+CONFIG_TEST_UUID=m
 CONFIG_TEXTSEARCH=y
 CONFIG_TEXTSEARCH_BM=m
 CONFIG_TEXTSEARCH_FSM=m
@@ -5279,7 +5279,7 @@  CONFIG_TOUCHSCREEN_CYTTSP4_SPI=m
 CONFIG_TOUCHSCREEN_CYTTSP_CORE=m
 CONFIG_TOUCHSCREEN_CYTTSP_I2C=m
 CONFIG_TOUCHSCREEN_CYTTSP_SPI=m
-CONFIG_TOUCHSCREEN_DA9034=y
+CONFIG_TOUCHSCREEN_DA9034=m
 CONFIG_TOUCHSCREEN_DA9052=m
 CONFIG_TOUCHSCREEN_DYNAPRO=m
 CONFIG_TOUCHSCREEN_EDT_FT5X06=m
@@ -5838,14 +5838,21 @@  CONFIG_V4L_TEST_DRIVERS=y
 CONFIG_VCNL4000=m
 CONFIG_VDSO=y
 CONFIG_VECTORS_BASE=0xffff0000
-# CONFIG_VEML6070 is not set
+CONFIG_VEML6070=m
 CONFIG_VERSION_SIGNATURE=""
 CONFIG_VETH=m
 # CONFIG_VEXPRESS_CONFIG is not set
 CONFIG_VF610_ADC=m
-# CONFIG_VF610_DAC is not set
+CONFIG_VF610_DAC=m
 CONFIG_VFAT_FS=y
-# CONFIG_VFIO is not set
+CONFIG_VFIO=m
+CONFIG_VFIO_AMBA=m
+# CONFIG_VFIO_IOMMU_TYPE1 is not set
+# CONFIG_VFIO_NOIOMMU is not set
+CONFIG_VFIO_PLATFORM=m
+CONFIG_VFIO_PLATFORM_AMDXGBE_RESET=m
+CONFIG_VFIO_PLATFORM_CALXEDAXGMAC_RESET=m
+CONFIG_VFIO_VIRQFD=m
 CONFIG_VFP=y
 CONFIG_VFPv3=y
 # CONFIG_VGASTATE is not set
@@ -5854,7 +5861,7 @@  CONFIG_VHOST=m
 CONFIG_VHOST_NET=m
 CONFIG_VHOST_RING=m
 CONFIG_VHOST_SCSI=m
-# CONFIG_VHOST_VSOCK is not set
+CONFIG_VHOST_VSOCK=m
 CONFIG_VIA_RHINE=m
 CONFIG_VIA_RHINE_MMIO=y
 CONFIG_VIA_VELOCITY=m
@@ -5934,12 +5941,12 @@  CONFIG_VIDEO_XILINX_VTC=m
 CONFIG_VIPERBOARD_ADC=m
 CONFIG_VIRTIO=m
 CONFIG_VIRTIO_BALLOON=m
-# CONFIG_VIRTIO_BLK is not set
+CONFIG_VIRTIO_BLK=m
 CONFIG_VIRTIO_CONSOLE=m
 CONFIG_VIRTIO_INPUT=m
 CONFIG_VIRTIO_MMIO=m
 CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
-# CONFIG_VIRTIO_NET is not set
+CONFIG_VIRTIO_NET=m
 CONFIG_VIRTIO_VSOCKETS=m
 CONFIG_VIRTIO_VSOCKETS_COMMON=m
 CONFIG_VIRTUALIZATION=y
@@ -6050,12 +6057,12 @@  CONFIG_X25_ASY=m
 CONFIG_X509_CERTIFICATE_PARSER=y
 # CONFIG_XEN is not set
 CONFIG_XFRM=y
-CONFIG_XFRM_ALGO=y
+CONFIG_XFRM_ALGO=m
 CONFIG_XFRM_IPCOMP=m
 # CONFIG_XFRM_MIGRATE is not set
 CONFIG_XFRM_STATISTICS=y
 # CONFIG_XFRM_SUB_POLICY is not set
-CONFIG_XFRM_USER=y
+CONFIG_XFRM_USER=m
 # CONFIG_XFS_DEBUG is not set
 CONFIG_XFS_FS=m
 CONFIG_XFS_POSIX_ACL=y