UBUNTU: Config Update to align on omap2plus_defconfig

Signed-off-by: Xavier Boudet <x-boudet@ti.com>

1 files changed, 143 insertions, 237 deletions

diff --git a/debian.ti-omap5/config/config.common.ubuntu b/debian.ti-omap5/config/config.common.ubuntu
index 0213fb499af5..bbf82b1bb2c7 100644
--- a/debian.ti-omap5/config/config.common.ubuntu
+++ b/debian.ti-omap5/config/config.common.ubuntu
@@ -128,7 +128,7 @@ CONFIG_ARM_UNWIND=y
 # CONFIG_ASYNC_TX_DMA is not set
 # CONFIG_AT76C50X_USB is not set
 # CONFIG_AT803X_PHY is not set
-CONFIG_ATA=m
+CONFIG_ATA=y
 CONFIG_ATAGS=y
 CONFIG_ATAGS_PROC=y
 # CONFIG_ATALK is not set
@@ -142,9 +142,7 @@ CONFIG_ATA_VERBOSE_ERROR=y
 # CONFIG_ATM is not set
 # CONFIG_ATMEL_PWM is not set
 # CONFIG_ATOMIC64_SELFTEST is not set
-CONFIG_AUDIT=y
-CONFIG_AUDIT_GENERIC=y
-# CONFIG_AUDIT_LOGINUID_IMMUTABLE is not set
+# CONFIG_AUDIT is not set
 # CONFIG_AUTOFS4_FS is not set
 # CONFIG_AUTO_ZRELADDR is not set
 # CONFIG_AUXDISPLAY is not set
@@ -155,7 +153,7 @@ CONFIG_AVERAGE=y
 # CONFIG_B44 is not set
 # CONFIG_BACKLIGHT_ADP8860 is not set
 # CONFIG_BACKLIGHT_ADP8870 is not set
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_CLASS_DEVICE=m
 CONFIG_BACKLIGHT_GENERIC=m
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 # CONFIG_BACKLIGHT_LM3630 is not set
@@ -185,23 +183,23 @@ CONFIG_BINFMT_ELF=y
 CONFIG_BINFMT_MISC=y
 CONFIG_BITREVERSE=y
 CONFIG_BLK_DEV=y
-CONFIG_BLK_DEV_BSG=y
-CONFIG_BLK_DEV_BSGLIB=y
+# CONFIG_BLK_DEV_BSG is not set
+# CONFIG_BLK_DEV_BSGLIB is not set
 # CONFIG_BLK_DEV_COW_COMMON is not set
-CONFIG_BLK_DEV_CRYPTOLOOP=m
-CONFIG_BLK_DEV_DM=y
-CONFIG_BLK_DEV_DRBD=m
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+# CONFIG_BLK_DEV_DM is not set
+# CONFIG_BLK_DEV_DRBD is not set
 CONFIG_BLK_DEV_INITRD=y
-CONFIG_BLK_DEV_INTEGRITY=y
-CONFIG_BLK_DEV_IO_TRACE=y
+# CONFIG_BLK_DEV_INTEGRITY is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
-CONFIG_BLK_DEV_MD=m
-CONFIG_BLK_DEV_NBD=m
+# CONFIG_BLK_DEV_MD is not set
+# CONFIG_BLK_DEV_NBD is not set
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_BLK_DEV_RAM_SIZE=65536
-CONFIG_BLK_DEV_RBD=m
+CONFIG_BLK_DEV_RAM_SIZE=16384
+# CONFIG_BLK_DEV_RBD is not set
 CONFIG_BLK_DEV_SD=y
 CONFIG_BLK_DEV_SR=m
 # CONFIG_BLK_DEV_SR_VENDOR is not set
@@ -246,14 +244,12 @@ CONFIG_BUG=y
 CONFIG_CACHE_L2X0=y
 # CONFIG_CAIF is not set
 # CONFIG_CAN is not set
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-CONFIG_CC_STACKPROTECTOR=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+# CONFIG_CC_STACKPROTECTOR is not set
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_CED1401 is not set
 # CONFIG_CEPH_FS is not set
-CONFIG_CEPH_LIB=m
-# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
-# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
+# CONFIG_CEPH_LIB is not set
 CONFIG_CFG80211=m
 # CONFIG_CFG80211_CERTIFICATION_ONUS is not set
 # CONFIG_CFG80211_DEBUGFS is not set
@@ -280,14 +276,14 @@ CONFIG_CFG80211_DEFAULT_PS=y
 CONFIG_CLKDEV_LOOKUP=y
 CONFIG_CLKSRC_MMIO=y
 # CONFIG_CMA is not set
-CONFIG_CMDLINE="console=ttyO2,115200n8 root=/dev/mmcblk0p2 rw rootwait mem=1G"
+CONFIG_CMDLINE="root=/dev/mmcblk0p2 rootwait console=ttyO2,115200"
 # CONFIG_CMDLINE_EXTEND is not set
 # CONFIG_CMDLINE_FORCE is not set
 CONFIG_CMDLINE_FROM_BOOTLOADER=y
 # CONFIG_CODA_FS is not set
 CONFIG_COMPACTION=y
-# CONFIG_COMPAT_BRK is not set
-CONFIG_CONFIGFS_FS=m
+CONFIG_COMPAT_BRK=y
+# CONFIG_CONFIGFS_FS is not set
 CONFIG_CONNECTOR=y
 CONFIG_CONSOLE_POLL=y
 CONFIG_CONSOLE_TRANSLATIONS=y
@@ -335,7 +331,7 @@ CONFIG_CPU_TLB_V7=y
 CONFIG_CPU_USE_DOMAINS=y
 CONFIG_CPU_V6=y
 CONFIG_CPU_V7=y
-CONFIG_CRAMFS=m
+CONFIG_CRAMFS=y
 # CONFIG_CRASH_DUMP is not set
 CONFIG_CRC16=y
 CONFIG_CRC32=y
@@ -344,10 +340,10 @@ CONFIG_CRC32=y
 # CONFIG_CRC32_SELFTEST is not set
 # CONFIG_CRC32_SLICEBY4 is not set
 CONFIG_CRC32_SLICEBY8=y
-CONFIG_CRC7=m
+CONFIG_CRC7=y
 # CONFIG_CRC8 is not set
-CONFIG_CRC_CCITT=m
-CONFIG_CRC_ITU_T=m
+CONFIG_CRC_CCITT=y
+CONFIG_CRC_ITU_T=y
 CONFIG_CRC_T10DIF=y
 CONFIG_CROSS_COMPILE=""
 CONFIG_CROSS_MEMORY_ATTACH=y
@@ -359,41 +355,41 @@ CONFIG_CRYPTO_ALGAPI=y
 CONFIG_CRYPTO_ALGAPI2=y
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
 # CONFIG_CRYPTO_ANUBIS is not set
-CONFIG_CRYPTO_ARC4=y
+CONFIG_CRYPTO_ARC4=m
 # CONFIG_CRYPTO_AUTHENC is not set
-CONFIG_CRYPTO_BLKCIPHER=y
+CONFIG_CRYPTO_BLKCIPHER=m
 CONFIG_CRYPTO_BLKCIPHER2=y
 # CONFIG_CRYPTO_BLOWFISH is not set
 # CONFIG_CRYPTO_CAMELLIA is not set
 # CONFIG_CRYPTO_CAST5 is not set
 # CONFIG_CRYPTO_CAST6 is not set
-CONFIG_CRYPTO_CBC=y
+# CONFIG_CRYPTO_CBC is not set
 # CONFIG_CRYPTO_CCM is not set
 CONFIG_CRYPTO_CRC32C=y
 # CONFIG_CRYPTO_CRYPTD is not set
 # CONFIG_CRYPTO_CTR is not set
 # CONFIG_CRYPTO_CTS is not set
-CONFIG_CRYPTO_DEFLATE=m
+CONFIG_CRYPTO_DEFLATE=y
 # CONFIG_CRYPTO_DES is not set
 # CONFIG_CRYPTO_DEV_OMAP_AES is not set
 # CONFIG_CRYPTO_DEV_OMAP_SHAM is not set
-CONFIG_CRYPTO_ECB=y
+CONFIG_CRYPTO_ECB=m
 # CONFIG_CRYPTO_FCRYPT is not set
 # CONFIG_CRYPTO_GCM is not set
 # CONFIG_CRYPTO_GF128MUL is not set
 # CONFIG_CRYPTO_GHASH is not set
 CONFIG_CRYPTO_HASH=y
 CONFIG_CRYPTO_HASH2=y
-CONFIG_CRYPTO_HMAC=m
+# CONFIG_CRYPTO_HMAC is not set
 CONFIG_CRYPTO_HW=y
 # CONFIG_CRYPTO_KHAZAD is not set
 # CONFIG_CRYPTO_LRW is not set
-CONFIG_CRYPTO_LZO=m
-CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_LZO=y
+CONFIG_CRYPTO_MANAGER=m
 CONFIG_CRYPTO_MANAGER2=y
 CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
 # CONFIG_CRYPTO_MD4 is not set
-CONFIG_CRYPTO_MD5=y
+# CONFIG_CRYPTO_MD5 is not set
 CONFIG_CRYPTO_MICHAEL_MIC=y
 # CONFIG_CRYPTO_NULL is not set
 # CONFIG_CRYPTO_PCBC is not set
@@ -408,7 +404,7 @@ CONFIG_CRYPTO_RNG2=y
 # CONFIG_CRYPTO_SEED is not set
 # CONFIG_CRYPTO_SEQIV is not set
 # CONFIG_CRYPTO_SERPENT is not set
-CONFIG_CRYPTO_SHA1=m
+# CONFIG_CRYPTO_SHA1 is not set
 # CONFIG_CRYPTO_SHA1_ARM is not set
 # CONFIG_CRYPTO_SHA256 is not set
 # CONFIG_CRYPTO_SHA512 is not set
@@ -478,27 +474,20 @@ CONFIG_DEFAULT_HOSTNAME="(none)"
 CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
 CONFIG_DEFAULT_IOSCHED="cfq"
 CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
-CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
+CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 # CONFIG_DEFAULT_NOOP is not set
 CONFIG_DEFAULT_SECURITY=""
-# CONFIG_DEFAULT_SECURITY_APPARMOR is not set
 CONFIG_DEFAULT_SECURITY_DAC=y
-# CONFIG_DEFAULT_SECURITY_SELINUX is not set
-# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
-# CONFIG_DEFAULT_SECURITY_YAMA is not set
 CONFIG_DEFAULT_TCP_CONG="cubic"
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 # CONFIG_DEPRECATED_PARAM_STRUCT is not set
 CONFIG_DETECT_HUNG_TASK=y
-# CONFIG_DEVKMEM is not set
-CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
+CONFIG_DEVKMEM=y
+# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 # CONFIG_DGRP is not set
-CONFIG_DLM=m
-# CONFIG_DLM_DEBUG is not set
-CONFIG_DM9000=m
-# CONFIG_DM9000_FORCE_SIMPLE_PHY_POLL is not set
+# CONFIG_DM9000 is not set
 CONFIG_DMADEVICES=y
 # CONFIG_DMADEVICES_DEBUG is not set
 # CONFIG_DMATEST is not set
@@ -507,30 +496,17 @@ CONFIG_DMA_ENGINE=y
 CONFIG_DMA_OMAP=y
 CONFIG_DMA_SHARED_BUFFER=y
 CONFIG_DMA_VIRTUAL_CHANNELS=y
-# CONFIG_DM_CRYPT is not set
-# CONFIG_DM_DEBUG is not set
-# CONFIG_DM_DELAY is not set
-# CONFIG_DM_FLAKEY is not set
-# CONFIG_DM_MIRROR is not set
-# CONFIG_DM_MULTIPATH is not set
-# CONFIG_DM_RAID is not set
-# CONFIG_DM_SNAPSHOT is not set
-# CONFIG_DM_THIN_PROVISIONING is not set
-# CONFIG_DM_UEVENT is not set
-# CONFIG_DM_VERITY is not set
-# CONFIG_DM_ZERO is not set
 # CONFIG_DNET is not set
 CONFIG_DNOTIFY=y
 # CONFIG_DNS_RESOLVER is not set
 CONFIG_DQL=y
-# CONFIG_DRBD_FAULT_INJECTION is not set
 CONFIG_DRM=y
 # CONFIG_DRM_I2C_CH7006 is not set
 # CONFIG_DRM_I2C_SIL164 is not set
 CONFIG_DRM_KMS_HELPER=y
 # CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
 CONFIG_DRM_OMAP=y
-CONFIG_DRM_OMAP_NUM_CRTCS=2
+CONFIG_DRM_OMAP_NUM_CRTCS=1
 # CONFIG_DRM_UDL is not set
 # CONFIG_DS1682 is not set
 CONFIG_DTC=y
@@ -541,9 +517,9 @@ CONFIG_DUMMY_CONSOLE=y
 CONFIG_DYNAMIC_DEBUG=y
 CONFIG_DYNAMIC_FTRACE=y
 # CONFIG_ECHO is not set
-CONFIG_ECRYPT_FS=y
+# CONFIG_ECRYPT_FS is not set
 # CONFIG_EDAC is not set
-CONFIG_EEPROM_93CX6=m
+CONFIG_EEPROM_93CX6=y
 # CONFIG_EEPROM_93XX46 is not set
 # CONFIG_EEPROM_AT24 is not set
 # CONFIG_EEPROM_AT25 is not set
@@ -568,7 +544,7 @@ CONFIG_EVENT_TRACING=y
 # CONFIG_EVM is not set
 CONFIG_EXPERIMENTAL=y
 CONFIG_EXPERT=y
-CONFIG_EXT2_FS=m
+CONFIG_EXT2_FS=y
 # CONFIG_EXT2_FS_XATTR is not set
 # CONFIG_EXT2_FS_XIP is not set
 CONFIG_EXT3_DEFAULTS_TO_ORDERED=y
@@ -617,7 +593,6 @@ CONFIG_FB_TILEBLITTING=y
 # CONFIG_FB_VIRTUAL is not set
 # CONFIG_FB_WMT_GE_ROPS is not set
 # CONFIG_FHANDLE is not set
-CONFIG_FIB_RULES=y
 CONFIG_FILE_LOCKING=y
 CONFIG_FIRMWARE_EDID=y
 CONFIG_FIRMWARE_IN_KERNEL=y
@@ -756,12 +731,13 @@ CONFIG_HAVE_UID16=y
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_HFSPLUS_FS is not set
 # CONFIG_HFS_FS is not set
-CONFIG_HID=m
+CONFIG_HID=y
 CONFIG_HIDRAW=y
 # CONFIG_HID_A4TECH is not set
 # CONFIG_HID_ACRUX is not set
-CONFIG_HID_APPLE=m
+CONFIG_HID_APPLE=y
 # CONFIG_HID_AUREAL is not set
+# CONFIG_HID_BATTERY_STRENGTH is not set
 # CONFIG_HID_BELKIN is not set
 # CONFIG_HID_CHERRY is not set
 # CONFIG_HID_CHICONY is not set
@@ -769,7 +745,7 @@ CONFIG_HID_APPLE=m
 # CONFIG_HID_DRAGONRISE is not set
 # CONFIG_HID_EMS_FF is not set
 # CONFIG_HID_EZKEY is not set
-CONFIG_HID_GENERIC=m
+CONFIG_HID_GENERIC=y
 # CONFIG_HID_GREENASIA is not set
 # CONFIG_HID_GYRATION is not set
 # CONFIG_HID_HOLTEK is not set
@@ -865,26 +841,17 @@ CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 # CONFIG_IMA is not set
 CONFIG_INET=y
-# CONFIG_INET6_AH is not set
-# CONFIG_INET6_ESP is not set
-# CONFIG_INET6_IPCOMP is not set
-CONFIG_INET6_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_BEET=y
-# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
-CONFIG_INET6_XFRM_MODE_TRANSPORT=y
-CONFIG_INET6_XFRM_MODE_TUNNEL=y
-# CONFIG_INET6_XFRM_TUNNEL is not set
 # CONFIG_INET_AH is not set
 CONFIG_INET_DIAG=y
 # CONFIG_INET_ESP is not set
 # CONFIG_INET_IPCOMP is not set
 # CONFIG_INET_LRO is not set
 CONFIG_INET_TCP_DIAG=y
-CONFIG_INET_TUNNEL=m
+# CONFIG_INET_TUNNEL is not set
 # CONFIG_INET_UDP_DIAG is not set
-CONFIG_INET_XFRM_MODE_BEET=m
-CONFIG_INET_XFRM_MODE_TRANSPORT=m
-CONFIG_INET_XFRM_MODE_TUNNEL=m
+CONFIG_INET_XFRM_MODE_BEET=y
+CONFIG_INET_XFRM_MODE_TRANSPORT=y
+CONFIG_INET_XFRM_MODE_TUNNEL=y
 # CONFIG_INET_XFRM_TUNNEL is not set
 # CONFIG_INFTL is not set
 CONFIG_INITRAMFS_SOURCE=""
@@ -899,11 +866,11 @@ CONFIG_INPUT=y
 # CONFIG_INPUT_CMA3000 is not set
 # CONFIG_INPUT_EVBUG is not set
 CONFIG_INPUT_EVDEV=y
-CONFIG_INPUT_FF_MEMLESS=m
+# CONFIG_INPUT_FF_MEMLESS is not set
 # CONFIG_INPUT_GP2A is not set
 # CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
 # CONFIG_INPUT_GPIO_TILT_POLLED is not set
-CONFIG_INPUT_JOYDEV=m
+CONFIG_INPUT_JOYDEV=y
 # CONFIG_INPUT_JOYSTICK is not set
 CONFIG_INPUT_KEYBOARD=y
 # CONFIG_INPUT_KEYSPAN_REMOTE is not set
@@ -924,34 +891,20 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 # CONFIG_INPUT_SPARSEKMAP is not set
 # CONFIG_INPUT_TABLET is not set
 CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_INPUT_TWL4030_PWRBUTTON=m
-CONFIG_INPUT_TWL4030_VIBRA=m
-CONFIG_INPUT_TWL6040_VIBRA=m
-CONFIG_INPUT_UINPUT=y
-CONFIG_INPUT_YEALINK=m
+CONFIG_INPUT_TWL4030_PWRBUTTON=y
+# CONFIG_INPUT_TWL4030_VIBRA is not set
+# CONFIG_INPUT_TWL6040_VIBRA is not set
+# CONFIG_INPUT_UINPUT is not set
+# CONFIG_INPUT_YEALINK is not set
 # CONFIG_INTERVAL_TREE_TEST is not set
 CONFIG_IOMMU_API=y
 CONFIG_IOMMU_SUPPORT=y
 CONFIG_IOSCHED_CFQ=y
 CONFIG_IOSCHED_DEADLINE=y
 CONFIG_IOSCHED_NOOP=y
-# CONFIG_IP6_NF_IPTABLES is not set
 # CONFIG_IPACK_BUS is not set
 # CONFIG_IPMI_HANDLER is not set
-CONFIG_IPV6=y
-# CONFIG_IPV6_GRE is not set
-CONFIG_IPV6_MIP6=m
-# CONFIG_IPV6_MROUTE is not set
-CONFIG_IPV6_MULTIPLE_TABLES=y
-CONFIG_IPV6_NDISC_NODETYPE=y
-# CONFIG_IPV6_OPTIMISTIC_DAD is not set
-CONFIG_IPV6_PRIVACY=y
-CONFIG_IPV6_ROUTER_PREF=y
-CONFIG_IPV6_ROUTE_INFO=y
-CONFIG_IPV6_SIT=m
-CONFIG_IPV6_SIT_6RD=y
-CONFIG_IPV6_SUBTREES=y
-CONFIG_IPV6_TUNNEL=m
+# CONFIG_IPV6 is not set
 # CONFIG_IPX is not set
 # CONFIG_IP_ADVANCED_ROUTER is not set
 # CONFIG_IP_DCCP is not set
@@ -964,7 +917,7 @@ CONFIG_IP_PNP=y
 CONFIG_IP_PNP_BOOTP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_RARP=y
-CONFIG_IP_SCTP=m
+# CONFIG_IP_SCTP is not set
 # CONFIG_IP_VS is not set
 # CONFIG_IRDA is not set
 # CONFIG_IRQSOFF_TRACER is not set
@@ -986,7 +939,7 @@ CONFIG_JBD2=y
 CONFIG_JFFS2_CMODE_PRIORITY=y
 # CONFIG_JFFS2_CMODE_SIZE is not set
 CONFIG_JFFS2_COMPRESSION_OPTIONS=y
-CONFIG_JFFS2_FS=m
+CONFIG_JFFS2_FS=y
 CONFIG_JFFS2_FS_DEBUG=0
 CONFIG_JFFS2_FS_POSIX_ACL=y
 CONFIG_JFFS2_FS_SECURITY=y
@@ -1012,7 +965,7 @@ CONFIG_KEXEC=y
 # CONFIG_KEYBOARD_ADP5588 is not set
 # CONFIG_KEYBOARD_ADP5589 is not set
 CONFIG_KEYBOARD_ATKBD=y
-CONFIG_KEYBOARD_GPIO=m
+CONFIG_KEYBOARD_GPIO=y
 # CONFIG_KEYBOARD_GPIO_POLLED is not set
 # CONFIG_KEYBOARD_LKKBD is not set
 # CONFIG_KEYBOARD_LM8323 is not set
@@ -1044,21 +997,21 @@ CONFIG_KPROBES=y
 CONFIG_KPROBE_EVENT=y
 CONFIG_KRETPROBES=y
 # CONFIG_KS8842 is not set
-CONFIG_KS8851=m
-CONFIG_KS8851_MLL=m
+CONFIG_KS8851=y
+CONFIG_KS8851_MLL=y
 # CONFIG_KSM is not set
 CONFIG_KTIME_SCALAR=y
 # CONFIG_L2TP is not set
 # CONFIG_LAPB is not set
 CONFIG_LBDAF=y
 # CONFIG_LCD_AMS369FG06 is not set
-CONFIG_LCD_CLASS_DEVICE=m
+CONFIG_LCD_CLASS_DEVICE=y
 # CONFIG_LCD_ILI9320 is not set
 # CONFIG_LCD_L4F00242T03 is not set
 # CONFIG_LCD_LD9040 is not set
 # CONFIG_LCD_LMS283GF05 is not set
 # CONFIG_LCD_LTV350QV is not set
-CONFIG_LCD_PLATFORM=m
+CONFIG_LCD_PLATFORM=y
 # CONFIG_LCD_S6E63M0 is not set
 # CONFIG_LCD_TDO24M is not set
 # CONFIG_LCD_VGG2432A4 is not set
@@ -1067,7 +1020,7 @@ CONFIG_LCD_PLATFORM=m
 # CONFIG_LEDS_BLINKM is not set
 CONFIG_LEDS_CLASS=y
 # CONFIG_LEDS_DAC124S085 is not set
-CONFIG_LEDS_GPIO=m
+CONFIG_LEDS_GPIO=y
 # CONFIG_LEDS_LM3530 is not set
 # CONFIG_LEDS_LM355x is not set
 # CONFIG_LEDS_LM3642 is not set
@@ -1093,16 +1046,10 @@ CONFIG_LEDS_TRIGGER_HEARTBEAT=y
 # CONFIG_LEDS_TRIGGER_TIMER is not set
 # CONFIG_LEDS_TRIGGER_TRANSIENT is not set
 # CONFIG_LEGACY_PTYS is not set
-CONFIG_LIB80211=y
-# CONFIG_LIB80211_DEBUG is not set
-CONFIG_LIBCRC32C=m
-CONFIG_LIBERTAS=m
-CONFIG_LIBERTAS_DEBUG=y
-# CONFIG_LIBERTAS_MESH is not set
-CONFIG_LIBERTAS_SDIO=m
-# CONFIG_LIBERTAS_SPI is not set
+# CONFIG_LIB80211 is not set
+CONFIG_LIBCRC32C=y
+# CONFIG_LIBERTAS is not set
 # CONFIG_LIBERTAS_THINFIRM is not set
-CONFIG_LIBERTAS_USB=m
 # CONFIG_LIBFC is not set
 # CONFIG_LIBFCOE is not set
 # CONFIG_LINE6_USB is not set
@@ -1111,7 +1058,7 @@ CONFIG_LIBERTAS_USB=m
 CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_LOCAL_TIMERS=y
-CONFIG_LOCKD=m
+CONFIG_LOCKD=y
 CONFIG_LOCKDEP=y
 CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_LOCKD_V4=y
@@ -1122,11 +1069,9 @@ CONFIG_LOGO=y
 CONFIG_LOGO_LINUX_CLUT224=y
 CONFIG_LOGO_LINUX_MONO=y
 CONFIG_LOGO_LINUX_VGA16=y
-CONFIG_LOG_BUF_SHIFT=20
-CONFIG_LRU_CACHE=m
-CONFIG_LSI_ET1011C_PHY=y
-CONFIG_LSM_MMAP_MIN_ADDR=0
-CONFIG_LXT_PHY=y
+CONFIG_LOG_BUF_SHIFT=16
+# CONFIG_LSI_ET1011C_PHY is not set
+# CONFIG_LXT_PHY is not set
 CONFIG_LZO_COMPRESS=y
 CONFIG_LZO_DECOMPRESS=y
 CONFIG_MAC80211=m
@@ -1188,13 +1133,6 @@ CONFIG_MD=y
 # CONFIG_MDIO_BITBANG is not set
 # CONFIG_MDIO_BUS_MUX_GPIO is not set
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
-# CONFIG_MD_FAULTY is not set
-# CONFIG_MD_LINEAR is not set
-# CONFIG_MD_MULTIPATH is not set
-# CONFIG_MD_RAID0 is not set
-# CONFIG_MD_RAID1 is not set
-# CONFIG_MD_RAID10 is not set
-# CONFIG_MD_RAID456 is not set
 # CONFIG_MEDIA_SUPPORT is not set
 # CONFIG_MEMORY is not set
 # CONFIG_MEMSTICK is not set
@@ -1243,7 +1181,7 @@ CONFIG_MFD_PALMAS_RESOURCE=y
 # CONFIG_MFD_TPS65910 is not set
 # CONFIG_MFD_TPS65912_I2C is not set
 # CONFIG_MFD_TPS65912_SPI is not set
-CONFIG_MFD_TWL4030_AUDIO=y
+# CONFIG_MFD_TWL4030_AUDIO is not set
 # CONFIG_MFD_WL1273_CORE is not set
 # CONFIG_MFD_WM831X_I2C is not set
 # CONFIG_MFD_WM831X_SPI is not set
@@ -1261,7 +1199,7 @@ CONFIG_MISC_FILESYSTEMS=y
 CONFIG_MMC=y
 CONFIG_MMC_BLOCK=y
 CONFIG_MMC_BLOCK_BOUNCE=y
-CONFIG_MMC_BLOCK_MINORS=16
+CONFIG_MMC_BLOCK_MINORS=8
 # CONFIG_MMC_CLKGATE is not set
 # CONFIG_MMC_DEBUG is not set
 # CONFIG_MMC_DW is not set
@@ -1286,7 +1224,7 @@ CONFIG_MODVERSIONS=y
 # CONFIG_MOUSE_APPLETOUCH is not set
 # CONFIG_MOUSE_BCM5974 is not set
 # CONFIG_MOUSE_GPIO is not set
-CONFIG_MOUSE_PS2=m
+CONFIG_MOUSE_PS2=y
 CONFIG_MOUSE_PS2_ALPS=y
 # CONFIG_MOUSE_PS2_ELANTECH is not set
 CONFIG_MOUSE_PS2_LOGIPS2PP=y
@@ -1301,33 +1239,33 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y
 # CONFIG_MPCORE_WATCHDOG is not set
 CONFIG_MSDOS_FS=y
 CONFIG_MSDOS_PARTITION=y
-CONFIG_MTD=m
+CONFIG_MTD=y
 # CONFIG_MTD_ABSENT is not set
 # CONFIG_MTD_AFS_PARTS is not set
 # CONFIG_MTD_ALAUDA is not set
 # CONFIG_MTD_AR7_PARTS is not set
-CONFIG_MTD_BLKDEVS=m
-CONFIG_MTD_BLOCK=m
+CONFIG_MTD_BLKDEVS=y
+CONFIG_MTD_BLOCK=y
 # CONFIG_MTD_BLOCK2MTD is not set
-# CONFIG_MTD_BLOCK_RO is not set
-CONFIG_MTD_CFI=m
+CONFIG_MTD_CFI=y
 # CONFIG_MTD_CFI_ADV_OPTIONS is not set
 # CONFIG_MTD_CFI_AMDSTD is not set
 CONFIG_MTD_CFI_I1=y
 CONFIG_MTD_CFI_I2=y
 # CONFIG_MTD_CFI_I4 is not set
 # CONFIG_MTD_CFI_I8 is not set
-CONFIG_MTD_CFI_INTELEXT=m
+CONFIG_MTD_CFI_INTELEXT=y
 # CONFIG_MTD_CFI_STAA is not set
-CONFIG_MTD_CFI_UTIL=m
-CONFIG_MTD_CHAR=m
+CONFIG_MTD_CFI_UTIL=y
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_CMDLINE_PARTS=y
 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
 # CONFIG_MTD_DATAFLASH is not set
 # CONFIG_MTD_DOC2000 is not set
 # CONFIG_MTD_DOC2001 is not set
 # CONFIG_MTD_DOC2001PLUS is not set
 # CONFIG_MTD_DOCG3 is not set
-CONFIG_MTD_GEN_PROBE=m
+CONFIG_MTD_GEN_PROBE=y
 # CONFIG_MTD_JEDECPROBE is not set
 # CONFIG_MTD_LPDDR is not set
 # CONFIG_MTD_M25P80 is not set
@@ -1338,28 +1276,28 @@ CONFIG_MTD_MAP_BANK_WIDTH_2=y
 CONFIG_MTD_MAP_BANK_WIDTH_4=y
 # CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
 # CONFIG_MTD_MTDRAM is not set
-CONFIG_MTD_NAND=m
+CONFIG_MTD_NAND=y
 # CONFIG_MTD_NAND_DISKONCHIP is not set
 # CONFIG_MTD_NAND_DOCG4 is not set
-CONFIG_MTD_NAND_ECC=m
+CONFIG_MTD_NAND_ECC=y
 # CONFIG_MTD_NAND_ECC_BCH is not set
 # CONFIG_MTD_NAND_ECC_SMC is not set
 # CONFIG_MTD_NAND_GPIO is not set
-CONFIG_MTD_NAND_IDS=m
+CONFIG_MTD_NAND_IDS=y
 # CONFIG_MTD_NAND_MUSEUM_IDS is not set
 # CONFIG_MTD_NAND_NANDSIM is not set
-CONFIG_MTD_NAND_OMAP2=m
+CONFIG_MTD_NAND_OMAP2=y
 # CONFIG_MTD_NAND_OMAP_BCH is not set
 # CONFIG_MTD_NAND_PLATFORM is not set
-CONFIG_MTD_OF_PARTS=m
-CONFIG_MTD_ONENAND=m
+CONFIG_MTD_OF_PARTS=y
+CONFIG_MTD_ONENAND=y
 # CONFIG_MTD_ONENAND_2X_PROGRAM is not set
 # CONFIG_MTD_ONENAND_GENERIC is not set
-CONFIG_MTD_ONENAND_OMAP2=m
+CONFIG_MTD_ONENAND_OMAP2=y
 # CONFIG_MTD_ONENAND_OTP is not set
 # CONFIG_MTD_ONENAND_SIM is not set
 CONFIG_MTD_ONENAND_VERIFY_WRITE=y
-CONFIG_MTD_OOPS=m
+CONFIG_MTD_OOPS=y
 # CONFIG_MTD_PHRAM is not set
 # CONFIG_MTD_PHYSMAP is not set
 # CONFIG_MTD_PHYSMAP_OF is not set
@@ -1372,7 +1310,7 @@ CONFIG_MTD_OOPS=m
 # CONFIG_MTD_SST25L is not set
 # CONFIG_MTD_SWAP is not set
 # CONFIG_MTD_TESTS is not set
-CONFIG_MTD_UBI=m
+CONFIG_MTD_UBI=y
 CONFIG_MTD_UBI_BEB_LIMIT=20
 # CONFIG_MTD_UBI_FASTMAP is not set
 # CONFIG_MTD_UBI_GLUEBI is not set
@@ -1399,7 +1337,7 @@ CONFIG_NETFILTER_ADVANCED=y
 # CONFIG_NETPOLL is not set
 CONFIG_NETWORK_FILESYSTEMS=y
 # CONFIG_NETWORK_PHY_TIMESTAMPING is not set
-CONFIG_NETWORK_SECMARK=y
+# CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NET_9P is not set
 # CONFIG_NET_CALXEDA_XGMAC is not set
 CONFIG_NET_CORE=y
@@ -1409,12 +1347,11 @@ CONFIG_NET_CORE=y
 # CONFIG_NET_IPGRE_DEMUX is not set
 # CONFIG_NET_IPIP is not set
 # CONFIG_NET_IPVTI is not set
-CONFIG_NET_KEY=m
+CONFIG_NET_KEY=y
 CONFIG_NET_KEY_MIGRATE=y
 # CONFIG_NET_PKTGEN is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
 # CONFIG_NET_SCHED is not set
-# CONFIG_NET_SCTPPROBE is not set
 # CONFIG_NET_TCPPROBE is not set
 # CONFIG_NET_TEAM is not set
 CONFIG_NET_VENDOR_8390=y
@@ -1436,21 +1373,20 @@ CONFIG_NET_VENDOR_WIZNET=y
 CONFIG_NEW_LEDS=y
 # CONFIG_NFC is not set
 # CONFIG_NFSD is not set
-CONFIG_NFS_ACL_SUPPORT=m
+CONFIG_NFS_ACL_SUPPORT=y
 CONFIG_NFS_COMMON=y
-CONFIG_NFS_FS=m
+CONFIG_NFS_FS=y
 # CONFIG_NFS_SWAP is not set
 CONFIG_NFS_USE_LEGACY_DNS=y
-CONFIG_NFS_V2=m
-CONFIG_NFS_V3=m
+CONFIG_NFS_V2=y
+CONFIG_NFS_V3=y
 CONFIG_NFS_V3_ACL=y
-CONFIG_NFS_V4=m
+CONFIG_NFS_V4=y
 CONFIG_NFS_V4_1=y
 CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
 # CONFIG_NFTL is not set
 # CONFIG_NF_CONNTRACK is not set
 # CONFIG_NF_DEFRAG_IPV4 is not set
-# CONFIG_NF_DEFRAG_IPV6 is not set
 # CONFIG_NILFS2_FS is not set
 # CONFIG_NL80211_TESTMODE is not set
 CONFIG_NLATTR=y
@@ -1513,7 +1449,6 @@ CONFIG_NR_CPUS=2
 # CONFIG_NTFS_FS is not set
 # CONFIG_N_GSM is not set
 CONFIG_OABI_COMPAT=y
-# CONFIG_OCFS2_FS is not set
 CONFIG_OF=y
 CONFIG_OF_ADDRESS=y
 CONFIG_OF_DEVICE=y
@@ -1575,7 +1510,7 @@ CONFIG_OMAP_RESET_CLOCKS=y
 CONFIG_OMAP_WATCHDOG=y
 # CONFIG_OMFS_FS is not set
 # CONFIG_OPENVSWITCH is not set
-CONFIG_OPROFILE=m
+CONFIG_OPROFILE=y
 # CONFIG_OSF_PARTITION is not set
 CONFIG_OUTER_CACHE=y
 CONFIG_OUTER_CACHE_SYNC=y
@@ -1587,7 +1522,7 @@ CONFIG_PAGE_OFFSET=0xC0000000
 # CONFIG_PALMAS_USB is not set
 # CONFIG_PALMAS_WATCHDOG is not set
 CONFIG_PANEL_ACX565AKM=m
-CONFIG_PANEL_GENERIC_DPI=y
+CONFIG_PANEL_GENERIC_DPI=m
 # CONFIG_PANEL_LG4591 is not set
 # CONFIG_PANEL_LGPHILIPS_LB035Q02 is not set
 # CONFIG_PANEL_N8X0 is not set
@@ -1616,7 +1551,6 @@ CONFIG_PHYLIB=y
 CONFIG_PINCONF=y
 CONFIG_PINCTRL=y
 # CONFIG_PINCTRL_EXYNOS4 is not set
-# CONFIG_PINCTRL_SAMSUNG is not set
 CONFIG_PINCTRL_SINGLE=y
 CONFIG_PINMUX=y
 CONFIG_PL310_ERRATA_588369=y
@@ -1639,7 +1573,6 @@ CONFIG_PM_SLEEP_DEBUG=y
 CONFIG_PM_SLEEP_SMP=y
 # CONFIG_PM_TEST_SUSPEND is not set
 # CONFIG_PM_WAKELOCKS is not set
-CONFIG_PNFS_BLOCK=m
 CONFIG_PNFS_FILE_LAYOUT=m
 CONFIG_POSIX_MQUEUE=y
 CONFIG_POSIX_MQUEUE_SYSCTL=y
@@ -1674,7 +1607,7 @@ CONFIG_PROVE_LOCKING=y
 # CONFIG_PSTORE is not set
 # CONFIG_PWM is not set
 # CONFIG_QFMT_V1 is not set
-CONFIG_QFMT_V2=m
+CONFIG_QFMT_V2=y
 # CONFIG_QNX4FS_FS is not set
 # CONFIG_QNX6FS_FS is not set
 # CONFIG_QSEMI_PHY is not set
@@ -1682,7 +1615,7 @@ CONFIG_QUOTA=y
 CONFIG_QUOTACTL=y
 # CONFIG_QUOTA_DEBUG is not set
 # CONFIG_QUOTA_NETLINK_INTERFACE is not set
-CONFIG_QUOTA_TREE=m
+CONFIG_QUOTA_TREE=y
 # CONFIG_R3964 is not set
 # CONFIG_R8712U is not set
 # CONFIG_RAID_ATTRS is not set
@@ -1727,14 +1660,14 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y
 # CONFIG_REGULATOR_MAX8952 is not set
 CONFIG_REGULATOR_PALMAS=y
 # CONFIG_REGULATOR_TPS62360 is not set
-CONFIG_REGULATOR_TPS65023=m
-CONFIG_REGULATOR_TPS6507X=m
+CONFIG_REGULATOR_TPS65023=y
+CONFIG_REGULATOR_TPS6507X=y
 # CONFIG_REGULATOR_TPS6524X is not set
 CONFIG_REGULATOR_TWL4030=y
 # CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
 # CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
 # CONFIG_REISERFS_FS is not set
-CONFIG_RELAY=y
+# CONFIG_RELAY is not set
 # CONFIG_RFD_FTL is not set
 # CONFIG_RFKILL is not set
 # CONFIG_RFKILL_REGULATOR is not set
@@ -1743,6 +1676,7 @@ CONFIG_RING_BUFFER=y
 CONFIG_RING_BUFFER_ALLOW_SWAP=y
 # CONFIG_RING_BUFFER_BENCHMARK is not set
 # CONFIG_ROMFS_FS is not set
+CONFIG_ROOT_NFS=y
 CONFIG_RPS=y
 # CONFIG_RT2X00 is not set
 CONFIG_RTC_CLASS=y
@@ -1816,7 +1750,7 @@ CONFIG_SAMPLES=y
 # CONFIG_SAMPLE_KPROBES is not set
 # CONFIG_SAMPLE_TRACEPOINTS is not set
 # CONFIG_SAMPLE_TRACE_EVENTS is not set
-CONFIG_SATA_AHCI_PLATFORM=m
+CONFIG_SATA_AHCI_PLATFORM=y
 # CONFIG_SATA_HIGHBANK is not set
 # CONFIG_SATA_MV is not set
 # CONFIG_SATA_PMP is not set
@@ -1847,37 +1781,16 @@ CONFIG_SCSI_SCAN_ASYNC=y
 # CONFIG_SCSI_SRP_ATTRS is not set
 # CONFIG_SCSI_TGT is not set
 # CONFIG_SCSI_VIRTIO is not set
-# CONFIG_SCTP_DBG_MSG is not set
-# CONFIG_SCTP_DBG_OBJCNT is not set
-CONFIG_SCTP_HMAC_MD5=y
-# CONFIG_SCTP_HMAC_NONE is not set
-# CONFIG_SCTP_HMAC_SHA1 is not set
-CONFIG_SDIO_UART=m
-CONFIG_SECCOMP=y
+CONFIG_SDIO_UART=y
+# CONFIG_SECCOMP is not set
 CONFIG_SECURITY=y
-CONFIG_SECURITYFS=y
-CONFIG_SECURITY_APPARMOR=y
-CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1
+# CONFIG_SECURITYFS is not set
+# CONFIG_SECURITY_APPARMOR is not set
 # CONFIG_SECURITY_DMESG_RESTRICT is not set
-CONFIG_SECURITY_NETWORK=y
-# CONFIG_SECURITY_NETWORK_XFRM is not set
-CONFIG_SECURITY_PATH=y
-CONFIG_SECURITY_SELINUX=y
-CONFIG_SECURITY_SELINUX_AVC_STATS=y
-CONFIG_SECURITY_SELINUX_BOOTPARAM=y
-CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0
-CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
-CONFIG_SECURITY_SELINUX_DEVELOP=y
-CONFIG_SECURITY_SELINUX_DISABLE=y
-# CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set
-CONFIG_SECURITY_TOMOYO=y
-CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/sbin/init"
-CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048
-CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024
-# CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set
-CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init"
-CONFIG_SECURITY_YAMA=y
-# CONFIG_SECURITY_YAMA_STACKED is not set
+# CONFIG_SECURITY_NETWORK is not set
+# CONFIG_SECURITY_PATH is not set
+# CONFIG_SECURITY_TOMOYO is not set
+# CONFIG_SECURITY_YAMA is not set
 # CONFIG_SEEQ8005 is not set
 CONFIG_SELECT_MEMORY_MODEL=y
 # CONFIG_SENSORS_AD7314 is not set
@@ -1967,7 +1880,7 @@ CONFIG_SELECT_MEMORY_MODEL=y
 # CONFIG_SENSORS_SMSC47M1 is not set
 # CONFIG_SENSORS_SMSC47M192 is not set
 # CONFIG_SENSORS_THMC50 is not set
-CONFIG_SENSORS_TMP102=m
+CONFIG_SENSORS_TMP102=y
 # CONFIG_SENSORS_TMP401 is not set
 # CONFIG_SENSORS_TMP421 is not set
 # CONFIG_SENSORS_TSL2550 is not set
@@ -2012,7 +1925,7 @@ CONFIG_SERIO=y
 CONFIG_SERIO_LIBPS2=y
 # CONFIG_SERIO_PS2MULT is not set
 # CONFIG_SERIO_RAW is not set
-CONFIG_SERIO_SERPORT=m
+CONFIG_SERIO_SERPORT=y
 # CONFIG_SGI_PARTITION is not set
 CONFIG_SHMEM=y
 CONFIG_SIGNALFD=y
@@ -2022,12 +1935,12 @@ CONFIG_SLABINFO=y
 # CONFIG_SLOB is not set
 # CONFIG_SLUB is not set
 # CONFIG_SMC911X is not set
-CONFIG_SMC91X=m
+CONFIG_SMC91X=y
 CONFIG_SMP=y
 CONFIG_SMP_ON_UP=y
 CONFIG_SMSC911X=y
 # CONFIG_SMSC911X_ARCH_HOOKS is not set
-CONFIG_SMSC_PHY=m
+CONFIG_SMSC_PHY=y
 # CONFIG_SM_FTL is not set
 CONFIG_SND=y
 # CONFIG_SND_ALOOP is not set
@@ -2129,19 +2042,19 @@ CONFIG_STANDALONE=y
 # CONFIG_STE_MODEM_RPROC is not set
 # CONFIG_STMMAC_ETH is not set
 CONFIG_STOP_MACHINE=y
-CONFIG_STRICT_DEVMEM=y
+# CONFIG_STRICT_DEVMEM is not set
 # CONFIG_STRIP_ASM_SYMS is not set
-CONFIG_SUNRPC=m
+CONFIG_SUNRPC=y
 CONFIG_SUNRPC_BACKCHANNEL=y
 # CONFIG_SUNRPC_DEBUG is not set
-CONFIG_SUNRPC_GSS=m
+CONFIG_SUNRPC_GSS=y
 # CONFIG_SUN_PARTITION is not set
 CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y
 CONFIG_SWAP=y
-CONFIG_SYN_COOKIES=y
+# CONFIG_SYN_COOKIES is not set
 CONFIG_SYSCTL=y
-CONFIG_SYSCTL_SYSCALL=y
+# CONFIG_SYSCTL_SYSCALL is not set
 CONFIG_SYSFS=y
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_SYSV68_PARTITION is not set
@@ -2161,7 +2074,7 @@ CONFIG_TCP_CONG_CUBIC=y
 # CONFIG_TEST_KSTRTOX is not set
 # CONFIG_TEST_LIST_SORT is not set
 # CONFIG_TEST_POWER is not set
-CONFIG_THERMAL=m
+CONFIG_THERMAL=y
 CONFIG_THERMAL_HWMON=y
 CONFIG_TICK_CPU_ACCOUNTING=y
 CONFIG_TICK_ONESHOT=y
@@ -2181,7 +2094,7 @@ CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_TMPFS_XATTR=y
 # CONFIG_TOUCHSCREEN_AD7877 is not set
 # CONFIG_TOUCHSCREEN_AD7879 is not set
-CONFIG_TOUCHSCREEN_ADS7846=m
+CONFIG_TOUCHSCREEN_ADS7846=y
 # CONFIG_TOUCHSCREEN_ATMEL_MXT is not set
 # CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set
 # CONFIG_TOUCHSCREEN_BU21013 is not set
@@ -2237,11 +2150,10 @@ CONFIG_TREE_PREEMPT_RCU=y
 CONFIG_TWL4030_CORE=y
 # CONFIG_TWL4030_MADC is not set
 CONFIG_TWL4030_POWER=y
-# CONFIG_TWL4030_USB is not set
 CONFIG_TWL4030_WATCHDOG=y
 CONFIG_TWL6040_CORE=y
 # CONFIG_UACCESS_WITH_MEMCPY is not set
-CONFIG_UBIFS_FS=m
+CONFIG_UBIFS_FS=y
 # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
 CONFIG_UBIFS_FS_LZO=y
 CONFIG_UBIFS_FS_ZLIB=y
@@ -2316,7 +2228,7 @@ CONFIG_USB_GADGET_VBUS_DRAW=2
 # CONFIG_USB_G_NCM is not set
 # CONFIG_USB_G_PRINTER is not set
 # CONFIG_USB_G_SERIAL is not set
-CONFIG_USB_HID=m
+CONFIG_USB_HID=y
 CONFIG_USB_HIDDEV=y
 # CONFIG_USB_IDMOUSE is not set
 # CONFIG_USB_IOWARRIOR is not set
@@ -2327,7 +2239,6 @@ CONFIG_USB_HIDDEV=y
 # CONFIG_USB_ISP1362_HCD is not set
 # CONFIG_USB_ISP1760_HCD is not set
 # CONFIG_USB_KAWETH is not set
-# CONFIG_USB_KBD is not set
 CONFIG_USB_KC2190=y
 # CONFIG_USB_LCD is not set
 # CONFIG_USB_LD is not set
@@ -2340,29 +2251,28 @@ CONFIG_USB_MASS_STORAGE=m
 # CONFIG_USB_MICROTEK is not set
 # CONFIG_USB_MIDI_GADGET is not set
 CONFIG_USB_MON=y
-# CONFIG_USB_MOUSE is not set
 # CONFIG_USB_MUSB_HDRC is not set
 # CONFIG_USB_MV_UDC is not set
 # CONFIG_USB_NET2272 is not set
-CONFIG_USB_NET_AX8817X=m
-CONFIG_USB_NET_CDCETHER=m
+CONFIG_USB_NET_AX8817X=y
+CONFIG_USB_NET_CDCETHER=y
 # CONFIG_USB_NET_CDC_EEM is not set
-CONFIG_USB_NET_CDC_NCM=m
-CONFIG_USB_NET_CDC_SUBSET=m
+CONFIG_USB_NET_CDC_NCM=y
+CONFIG_USB_NET_CDC_SUBSET=y
 # CONFIG_USB_NET_CX82310_ETH is not set
 # CONFIG_USB_NET_DM9601 is not set
 # CONFIG_USB_NET_GL620A is not set
 # CONFIG_USB_NET_INT51X1 is not set
 # CONFIG_USB_NET_KALMIA is not set
 # CONFIG_USB_NET_MCS7830 is not set
-CONFIG_USB_NET_NET1080=m
+CONFIG_USB_NET_NET1080=y
 # CONFIG_USB_NET_PLUSB is not set
 # CONFIG_USB_NET_QMI_WWAN is not set
 # CONFIG_USB_NET_RNDIS_HOST is not set
 # CONFIG_USB_NET_RNDIS_WLAN is not set
 # CONFIG_USB_NET_SMSC75XX is not set
 CONFIG_USB_NET_SMSC95XX=y
-CONFIG_USB_NET_ZAURUS=m
+CONFIG_USB_NET_ZAURUS=y
 # CONFIG_USB_OHCI_HCD is not set
 # CONFIG_USB_OTG is not set
 # CONFIG_USB_OTG_BLACKLIST_HUB is not set
@@ -2398,14 +2308,14 @@ CONFIG_USB_STORAGE=y
 CONFIG_USB_SUPPORT=y
 CONFIG_USB_SUSPEND=y
 # CONFIG_USB_SWITCH_FSA9480 is not set
-CONFIG_USB_TEST=m
+CONFIG_USB_TEST=y
 # CONFIG_USB_TMC is not set
 # CONFIG_USB_TRANCEVIBRATOR is not set
 # CONFIG_USB_UAS is not set
 # CONFIG_USB_ULPI is not set
 CONFIG_USB_USBNET=y
 # CONFIG_USB_VL600 is not set
-CONFIG_USB_WDM=m
+CONFIG_USB_WDM=y
 # CONFIG_USB_WPAN_HCD is not set
 # CONFIG_USB_WUSB_CBAF is not set
 # CONFIG_USB_YUREX is not set
@@ -2443,7 +2353,7 @@ CONFIG_VT_CONSOLE_SLEEP=y
 CONFIG_VT_HW_CONSOLE_BINDING=y
 # CONFIG_VXFS_FS is not set
 # CONFIG_VXLAN is not set
-CONFIG_W1=m
+CONFIG_W1=y
 CONFIG_W1_CON=y
 # CONFIG_W1_MASTER_DS1WM is not set
 # CONFIG_W1_MASTER_DS2482 is not set
@@ -2466,24 +2376,20 @@ CONFIG_W1_CON=y
 CONFIG_WATCHDOG=y
 # CONFIG_WATCHDOG_CORE is not set
 # CONFIG_WATCHDOG_NOWAYOUT is not set
-CONFIG_WEXT_CORE=y
-CONFIG_WEXT_PROC=y
-CONFIG_WEXT_SPY=y
 # CONFIG_WIMAX is not set
 # CONFIG_WIMAX_GDM72XX is not set
 CONFIG_WIRELESS=y
-CONFIG_WIRELESS_EXT=y
 # CONFIG_WIZNET_W5100 is not set
 # CONFIG_WIZNET_W5300 is not set
 CONFIG_WLAN=y
 # CONFIG_WL_TI is not set
 # CONFIG_X25 is not set
 CONFIG_XFRM=y
-CONFIG_XFRM_ALGO=m
+CONFIG_XFRM_ALGO=y
 CONFIG_XFRM_MIGRATE=y
 # CONFIG_XFRM_STATISTICS is not set
 # CONFIG_XFRM_SUB_POLICY is not set
-CONFIG_XFRM_USER=m
+CONFIG_XFRM_USER=y
 # CONFIG_XFS_FS is not set
 # CONFIG_XIP_KERNEL is not set
 CONFIG_XPS=y
@@ -2492,7 +2398,7 @@ CONFIG_XPS=y
 CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_ZBOOT_ROM_TEXT=0x0
 # CONFIG_ZD1211RW is not set
-CONFIG_ZLIB_DEFLATE=m
+CONFIG_ZLIB_DEFLATE=y
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZONE_DMA_FLAG=0
 # CONFIG_ZSMALLOC is not set