>From eee8f941f29294f1cc94f68f556acac38d913062 Mon Sep 17 00:00:00 2001
From: Guillaume GARDET <guillaume.gardet@oliseo.fr>
Date: Thu, 8 Aug 2013 12:05:35 +0200
Subject: [PATCH] Update default config to 3.11.0-rc4 and add sound modules
 and TI wifi modules

---
 config/armv7hl/default |  375 +++++++++++++++++++++++++++++++++---------------
 1 file changed, 260 insertions(+), 115 deletions(-)

diff --git a/config/armv7hl/default b/config/armv7hl/default
index a8ecdb3..4332187 100644
--- a/config/armv7hl/default
+++ b/config/armv7hl/default
@@ -1,8 +1,9 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.10.1 Kernel Configuration
+# Linux/arm 3.11.0-rc4 Kernel Configuration
 #
 CONFIG_ARM=y
+CONFIG_MIGHT_HAVE_PCI=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 CONFIG_HAVE_PROC_CPU=y
 CONFIG_NO_IOPORT=y
@@ -11,6 +12,7 @@ CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 CONFIG_ARCH_HAS_CPUFREQ=y
+CONFIG_ARCH_HAS_BANDGAP=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_NEED_DMA_MAP_STATE=y
@@ -30,16 +32,19 @@ CONFIG_BUILDTIME_EXTABLE_SORT=y
 #
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
+# CONFIG_COMPILE_TEST is not set
 CONFIG_LOCALVERSION="-default"
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_LZMA=y
 CONFIG_HAVE_KERNEL_XZ=y
 CONFIG_HAVE_KERNEL_LZO=y
+CONFIG_HAVE_KERNEL_LZ4=y
 CONFIG_KERNEL_GZIP=y
 # CONFIG_KERNEL_LZMA is not set
 # CONFIG_KERNEL_XZ is not set
 # CONFIG_KERNEL_LZO is not set
+# CONFIG_KERNEL_LZ4 is not set
 CONFIG_DEFAULT_HOSTNAME="(none)"
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
@@ -108,6 +113,7 @@ CONFIG_RCU_FANOUT_LEAF=16
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=18
+CONFIG_GENERIC_SCHED_CLOCK=y
 CONFIG_CGROUPS=y
 # CONFIG_CGROUP_DEBUG is not set
 CONFIG_CGROUP_FREEZER=y
@@ -144,11 +150,11 @@ CONFIG_RD_BZIP2=y
 CONFIG_RD_LZMA=y
 CONFIG_RD_XZ=y
 CONFIG_RD_LZO=y
+CONFIG_RD_LZ4=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
 CONFIG_ANON_INODES=y
 CONFIG_HAVE_UID16=y
-CONFIG_HOTPLUG=y
 # CONFIG_EXPERT is not set
 CONFIG_UID16=y
 # CONFIG_SYSCTL_SYSCALL is not set
@@ -238,6 +244,7 @@ CONFIG_BLK_DEV_THROTTLING=y
 #
 CONFIG_PARTITION_ADVANCED=y
 # CONFIG_ACORN_PARTITION is not set
+# CONFIG_AIX_PARTITION is not set
 CONFIG_OSF_PARTITION=y
 # CONFIG_AMIGA_PARTITION is not set
 CONFIG_ATARI_PARTITION=y
@@ -316,7 +323,6 @@ CONFIG_ARCH_MULTIPLATFORM=y
 # CONFIG_ARCH_S5PV210 is not set
 # CONFIG_ARCH_EXYNOS is not set
 # CONFIG_ARCH_SHARK is not set
-# CONFIG_ARCH_U300 is not set
 # CONFIG_ARCH_DAVINCI is not set
 # CONFIG_ARCH_OMAP1 is not set
 
@@ -343,6 +349,7 @@ CONFIG_ARCH_BCM=y
 CONFIG_GPIO_PCA953X=m
 CONFIG_KEYBOARD_GPIO_POLLED=m
 CONFIG_ARCH_HIGHBANK=y
+# CONFIG_ARCH_KEYSTONE is not set
 CONFIG_ARCH_MXC=y
 
 #
@@ -372,6 +379,8 @@ CONFIG_MACH_EUKREA_MBIMXSD51_BASEBOARD=y
 #
 CONFIG_SOC_IMX53=y
 CONFIG_SOC_IMX6Q=y
+# CONFIG_SOC_IMX6SL is not set
+# CONFIG_SOC_VF610 is not set
 CONFIG_IMX_HAVE_PLATFORM_FEC=y
 CONFIG_IMX_HAVE_PLATFORM_FSL_USB2_UDC=y
 CONFIG_IMX_HAVE_PLATFORM_GPIO_KEYS=y
@@ -403,6 +412,11 @@ CONFIG_OMAP_DM_TIMER=y
 CONFIG_OMAP_PM_NOOP=y
 CONFIG_MACH_OMAP_GENERIC=y
 CONFIG_ARCH_OMAP=y
+CONFIG_ARCH_OMAP3=y
+CONFIG_ARCH_OMAP4=y
+CONFIG_SOC_OMAP5=y
+CONFIG_SOC_AM33XX=y
+# CONFIG_SOC_AM43XX is not set
 CONFIG_ARCH_OMAP2PLUS=y
 
 #
@@ -411,17 +425,11 @@ CONFIG_ARCH_OMAP2PLUS=y
 CONFIG_ARCH_OMAP2PLUS_TYPICAL=y
 CONFIG_SOC_HAS_OMAP2_SDRC=y
 CONFIG_SOC_HAS_REALTIME_COUNTER=y
-CONFIG_ARCH_OMAP3=y
-CONFIG_ARCH_OMAP4=y
-CONFIG_SOC_OMAP5=y
 CONFIG_SOC_OMAP3430=y
 CONFIG_SOC_TI81XX=y
-CONFIG_SOC_AM33XX=y
 CONFIG_OMAP_PACKAGE_CBB=y
 CONFIG_OMAP_PACKAGE_CUS=y
 CONFIG_OMAP_PACKAGE_CBP=y
-CONFIG_OMAP_PACKAGE_CBL=y
-CONFIG_OMAP_PACKAGE_CBS=y
 
 #
 # OMAP Board Type
@@ -451,15 +459,27 @@ CONFIG_MACH_SBC3530=y
 CONFIG_MACH_OMAP_3630SDP=y
 CONFIG_MACH_TI8168EVM=y
 CONFIG_MACH_TI8148EVM=y
-CONFIG_MACH_OMAP_4430SDP=y
-CONFIG_MACH_OMAP4_PANDA=y
 # CONFIG_OMAP3_EMU is not set
 # CONFIG_OMAP3_SDRC_AC_TIMING is not set
+# CONFIG_ARCH_ROCKCHIP is not set
 CONFIG_ARCH_SOCFPGA=y
 # CONFIG_PLAT_SPEAR is not set
+# CONFIG_ARCH_STI is not set
 CONFIG_ARCH_SUNXI=y
 # CONFIG_ARCH_SIRF is not set
 # CONFIG_ARCH_TEGRA is not set
+
+#
+# ST-Ericsson AB U300/U335 Platform
+#
+
+#
+# ST-Ericsson Mobile Platform Products
+#
+
+#
+# ST-Ericsson U300/U335 Feature Selections
+#
 # CONFIG_ARCH_U8500 is not set
 CONFIG_ARCH_VEXPRESS=y
 
@@ -507,6 +527,7 @@ CONFIG_ARM_VIRT_EXT=y
 # CONFIG_CPU_ICACHE_DISABLE is not set
 # CONFIG_CPU_DCACHE_DISABLE is not set
 # CONFIG_CPU_BPREDICT_DISABLE is not set
+CONFIG_KUSER_HELPERS=y
 CONFIG_OUTER_CACHE=y
 CONFIG_OUTER_CACHE_SYNC=y
 CONFIG_MIGHT_HAVE_CACHE_L2X0=y
@@ -531,11 +552,13 @@ CONFIG_PL310_ERRATA_769419=y
 CONFIG_ARM_ERRATA_775420=y
 CONFIG_ARM_ERRATA_798181=y
 CONFIG_ICST=y
+CONFIG_TI_PRIV_EDMA=y
 
 #
 # Bus support
 #
 CONFIG_ARM_AMBA=y
+# CONFIG_PCI is not set
 # CONFIG_PCI_SYSCALL is not set
 # CONFIG_PCCARD is not set
 
@@ -589,19 +612,19 @@ CONFIG_MIGRATION=y
 # CONFIG_PHYS_ADDR_T_64BIT is not set
 CONFIG_ZONE_DMA_FLAG=0
 CONFIG_BOUNCE=y
-CONFIG_MMU_NOTIFIER=y
 CONFIG_KSM=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
 CONFIG_CROSS_MEMORY_ATTACH=y
 CONFIG_CLEANCACHE=y
 CONFIG_FRONTSWAP=y
+# CONFIG_ZBUD is not set
+# CONFIG_ZSWAP is not set
 CONFIG_FORCE_MAX_ZONEORDER=12
 CONFIG_ALIGNMENT_TRAP=y
 CONFIG_UACCESS_WITH_MEMCPY=y
 CONFIG_SECCOMP=y
 CONFIG_CC_STACKPROTECTOR=y
-CONFIG_XEN_DOM0=y
-CONFIG_PARAVIRT_XEN=y
+# CONFIG_XEN is not set
 
 #
 # Boot options
@@ -662,8 +685,9 @@ CONFIG_CPU_IDLE=y
 # CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set
 CONFIG_CPU_IDLE_GOV_LADDER=y
 CONFIG_CPU_IDLE_GOV_MENU=y
-CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED=y
 CONFIG_CPU_IDLE_CALXEDA=y
+CONFIG_CPU_IDLE_ZYNQ=y
+CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED=y
 
 #
 # Floating point emulation
@@ -686,8 +710,7 @@ CONFIG_BINFMT_ELF=y
 CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y
 CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 CONFIG_BINFMT_SCRIPT=y
-CONFIG_HAVE_AOUT=y
-CONFIG_BINFMT_AOUT=m
+# CONFIG_HAVE_AOUT is not set
 CONFIG_BINFMT_MISC=m
 CONFIG_COREDUMP=y
 
@@ -710,6 +733,7 @@ CONFIG_APM_EMULATION=m
 CONFIG_ARCH_HAS_OPP=y
 CONFIG_PM_OPP=y
 CONFIG_PM_CLK=y
+# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
 CONFIG_CPU_PM=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ARM_CPU_SUSPEND=y
@@ -1101,7 +1125,6 @@ CONFIG_IP_DCCP_TFRC_LIB=y
 # CONFIG_NET_DCCPPROBE is not set
 CONFIG_IP_SCTP=m
 CONFIG_NET_SCTPPROBE=m
-# CONFIG_SCTP_DBG_MSG is not set
 # CONFIG_SCTP_DBG_OBJCNT is not set
 CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5=y
 # CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1 is not set
@@ -1227,15 +1250,19 @@ CONFIG_BATMAN_ADV_DAT=y
 # CONFIG_BATMAN_ADV_NC is not set
 CONFIG_BATMAN_ADV_DEBUG=y
 CONFIG_OPENVSWITCH=m
+CONFIG_OPENVSWITCH_GRE=y
 CONFIG_VSOCKETS=m
 CONFIG_NETLINK_MMAP=y
 CONFIG_NETLINK_DIAG=m
+# CONFIG_NET_MPLS_GSO is not set
 CONFIG_RPS=y
 CONFIG_RFS_ACCEL=y
 CONFIG_XPS=y
 CONFIG_NETPRIO_CGROUP=m
+CONFIG_NET_RX_BUSY_POLL=y
 CONFIG_BQL=y
 # CONFIG_BPF_JIT is not set
+CONFIG_NET_FLOW_LIMIT=y
 
 #
 # Network testing
@@ -1279,7 +1306,6 @@ CONFIG_CAN_CALC_BITTIMING=y
 CONFIG_CAN_LEDS=y
 # CONFIG_CAN_AT91 is not set
 CONFIG_CAN_TI_HECC=m
-CONFIG_HAVE_CAN_FLEXCAN=y
 CONFIG_CAN_FLEXCAN=m
 # CONFIG_CAN_GRCAN is not set
 CONFIG_CAN_SJA1000=m
@@ -1441,6 +1467,7 @@ CONFIG_NFC_HCI=m
 #
 CONFIG_NFC_PN533=m
 CONFIG_NFC_WILINK=m
+# CONFIG_NFC_SIM is not set
 CONFIG_NFC_PN544=m
 CONFIG_NFC_MICROREAD=m
 CONFIG_HAVE_BPF_JIT=y
@@ -1463,7 +1490,7 @@ CONFIG_EXTRA_FIRMWARE=""
 CONFIG_FW_LOADER_USER_HELPER=y
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
-CONFIG_SYS_HYPERVISOR=y
+# CONFIG_SYS_HYPERVISOR is not set
 # CONFIG_GENERIC_CPU_DEVICES is not set
 CONFIG_SOC_BUS=y
 CONFIG_REGMAP=y
@@ -1488,9 +1515,11 @@ CONFIG_CMA_AREAS=7
 #
 # Bus devices
 #
+# CONFIG_IMX_WEIM is not set
 CONFIG_MVEBU_MBUS=y
 CONFIG_OMAP_OCP2SCP=m
 CONFIG_OMAP_INTERCONNECT=y
+# CONFIG_ARM_CCI is not set
 CONFIG_CONNECTOR=y
 CONFIG_PROC_EVENTS=y
 CONFIG_MTD=m
@@ -1632,7 +1661,6 @@ CONFIG_OF_FLATTREE=y
 CONFIG_OF_EARLY_FLATTREE=y
 CONFIG_OF_ADDRESS=y
 CONFIG_OF_IRQ=y
-CONFIG_OF_DEVICE=y
 CONFIG_OF_I2C=y
 CONFIG_OF_NET=y
 CONFIG_OF_MDIO=m
@@ -1694,8 +1722,6 @@ CONFIG_CDROM_PKTCDVD_WCACHE=y
 CONFIG_ATA_OVER_ETH=m
 CONFIG_MG_DISK=m
 CONFIG_MG_DISK_RES=0
-CONFIG_PARAVIRT_XEN_BLKDEV_FRONTEND=m
-CONFIG_PARAVIRT_XEN_BLKDEV_BACKEND=m
 CONFIG_VIRTIO_BLK=m
 CONFIG_BLK_DEV_RBD=m
 
@@ -1816,6 +1842,7 @@ CONFIG_SATA_PMP=y
 # Controllers with non-SFF native interface
 #
 CONFIG_SATA_AHCI_PLATFORM=m
+# CONFIG_AHCI_IMX is not set
 CONFIG_ATA_SFF=y
 
 #
@@ -1828,6 +1855,7 @@ CONFIG_ATA_BMDMA=y
 #
 CONFIG_SATA_HIGHBANK=m
 CONFIG_SATA_MV=m
+# CONFIG_SATA_RCAR is not set
 
 #
 # PATA SFF controllers with BMDMA
@@ -1880,6 +1908,7 @@ CONFIG_DM_RAID45=m
 CONFIG_DM_UEVENT=y
 CONFIG_DM_FLAKEY=m
 CONFIG_DM_VERITY=m
+# CONFIG_DM_SWITCH is not set
 CONFIG_TARGET_CORE=m
 CONFIG_TCM_IBLOCK=m
 CONFIG_TCM_FILEIO=m
@@ -1888,11 +1917,11 @@ CONFIG_LOOPBACK_TARGET=m
 CONFIG_TCM_FC=m
 CONFIG_ISCSI_TARGET=m
 CONFIG_NETDEVICES=y
+CONFIG_MII=m
 CONFIG_NET_CORE=y
 CONFIG_BONDING=m
 CONFIG_DUMMY=m
 CONFIG_EQUALIZER=m
-CONFIG_MII=y
 CONFIG_IFB=m
 CONFIG_NET_TEAM=m
 CONFIG_NET_TEAM_MODE_BROADCAST=m
@@ -1911,6 +1940,7 @@ CONFIG_NET_POLL_CONTROLLER=y
 CONFIG_TUN=m
 CONFIG_VETH=m
 CONFIG_VIRTIO_NET=m
+# CONFIG_NLMON is not set
 CONFIG_ATM_DRIVERS=y
 CONFIG_ATM_DUMMY=m
 CONFIG_ATM_TCP=m
@@ -1926,6 +1956,7 @@ CONFIG_CAIF_VIRTIO=m
 CONFIG_VHOST_NET=m
 CONFIG_VHOST_SCSI=m
 CONFIG_VHOST_RING=m
+CONFIG_VHOST=m
 
 #
 # Distributed Switch Architecture drivers
@@ -1936,6 +1967,10 @@ CONFIG_NET_DSA_MV88E6XXX_NEED_PPU=y
 CONFIG_NET_DSA_MV88E6131=m
 CONFIG_NET_DSA_MV88E6123_61_65=m
 CONFIG_ETHERNET=y
+CONFIG_NET_VENDOR_ALLWINNER=y
+# CONFIG_SUN4I_EMAC is not set
+CONFIG_NET_VENDOR_ARC=y
+# CONFIG_ARC_EMAC is not set
 CONFIG_NET_CADENCE=y
 CONFIG_ARM_AT91_ETHER=m
 CONFIG_MACB=m
@@ -1965,6 +2000,7 @@ CONFIG_NET_VENDOR_NATSEMI=y
 CONFIG_NET_VENDOR_8390=y
 # CONFIG_AX88796 is not set
 CONFIG_ETHOC=m
+# CONFIG_SH_ETH is not set
 CONFIG_NET_VENDOR_SEEQ=y
 CONFIG_NET_VENDOR_SMSC=y
 CONFIG_SMC91X=m
@@ -1979,12 +2015,16 @@ CONFIG_TI_DAVINCI_MDIO=m
 CONFIG_TI_DAVINCI_CPDMA=m
 CONFIG_TI_CPSW=m
 # CONFIG_TI_CPTS is not set
+CONFIG_NET_VENDOR_VIA=y
+# CONFIG_VIA_VELOCITY is not set
 CONFIG_NET_VENDOR_WIZNET=y
 CONFIG_WIZNET_W5100=m
 CONFIG_WIZNET_W5300=m
 # CONFIG_WIZNET_BUS_DIRECT is not set
 # CONFIG_WIZNET_BUS_INDIRECT is not set
 CONFIG_WIZNET_BUS_ANY=y
+CONFIG_NET_VENDOR_XILINX=y
+# CONFIG_XILINX_EMACLITE is not set
 CONFIG_PHYLIB=m
 
 #
@@ -2009,6 +2049,7 @@ CONFIG_LSI_ET1011C_PHY=m
 CONFIG_MICREL_PHY=m
 CONFIG_MDIO_BITBANG=m
 CONFIG_MDIO_GPIO=m
+# CONFIG_MDIO_SUN4I is not set
 CONFIG_MDIO_BUS_MUX=m
 CONFIG_MDIO_BUS_MUX_GPIO=m
 CONFIG_MDIO_BUS_MUX_MMIOREG=m
@@ -2100,6 +2141,7 @@ CONFIG_CARL9170_WPC=y
 # CONFIG_CARL9170_HWRNG is not set
 # CONFIG_ATH6KL is not set
 CONFIG_AR5523=m
+# CONFIG_ATH10K is not set
 # CONFIG_B43 is not set
 # CONFIG_B43LEGACY is not set
 CONFIG_BRCMUTIL=m
@@ -2135,16 +2177,26 @@ CONFIG_RT2X00_LIB_CRYPTO=y
 CONFIG_RT2X00_LIB_LEDS=y
 # CONFIG_RT2X00_LIB_DEBUGFS is not set
 # CONFIG_RT2X00_DEBUG is not set
+CONFIG_RTL_CARDS=m
+CONFIG_RTL8192CU=m
 CONFIG_RTLWIFI=m
+CONFIG_RTLWIFI_USB=m
 CONFIG_RTLWIFI_DEBUG=y
-CONFIG_RTL8192CU=m
 CONFIG_RTL8192C_COMMON=m
-# CONFIG_WL_TI is not set
+CONFIG_WL_TI=y
+CONFIG_WL1251=m
+CONFIG_WL1251_SDIO=m
+CONFIG_WL12XX=m
+CONFIG_WL18XX=m
+CONFIG_WLCORE=m
+CONFIG_WLCORE_SDIO=m
+CONFIG_WILINK_PLATFORM_DATA=y
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
 CONFIG_MWIFIEX=m
 CONFIG_MWIFIEX_SDIO=m
 # CONFIG_MWIFIEX_USB is not set
+# CONFIG_CW1200 is not set
 
 #
 # WiMAX Wireless Broadband devices
@@ -2167,8 +2219,6 @@ CONFIG_X25_ASY=m
 CONFIG_IEEE802154_DRIVERS=m
 CONFIG_IEEE802154_FAKEHARD=m
 CONFIG_IEEE802154_FAKELB=m
-CONFIG_PARAVIRT_XEN_NETDEV_FRONTEND=m
-CONFIG_PARAVIRT_XEN_NETDEV_BACKEND=m
 CONFIG_ISDN=y
 CONFIG_ISDN_I4L=m
 CONFIG_ISDN_PPP=y
@@ -2383,6 +2433,7 @@ CONFIG_TOUCHSCREEN_BU21013=m
 CONFIG_TOUCHSCREEN_CY8CTMG110=m
 CONFIG_TOUCHSCREEN_CYTTSP_CORE=m
 CONFIG_TOUCHSCREEN_CYTTSP_I2C=m
+# CONFIG_TOUCHSCREEN_CYTTSP4_CORE is not set
 CONFIG_TOUCHSCREEN_DA9034=m
 CONFIG_TOUCHSCREEN_DA9052=m
 CONFIG_TOUCHSCREEN_DYNAPRO=m
@@ -2393,7 +2444,6 @@ CONFIG_TOUCHSCREEN_FUJITSU=m
 CONFIG_TOUCHSCREEN_ILI210X=m
 CONFIG_TOUCHSCREEN_GUNZE=m
 CONFIG_TOUCHSCREEN_ELO=m
-CONFIG_TOUCHSCREEN_ELOUSB=m
 CONFIG_TOUCHSCREEN_WACOM_W8001=m
 # CONFIG_TOUCHSCREEN_WACOM_I2C is not set
 CONFIG_TOUCHSCREEN_MAX11801=m
@@ -2445,6 +2495,7 @@ CONFIG_INPUT_88PM860X_ONKEY=m
 CONFIG_INPUT_88PM80X_ONKEY=m
 CONFIG_INPUT_AD714X=m
 CONFIG_INPUT_AD714X_I2C=m
+# CONFIG_INPUT_ARIZONA_HAPTICS is not set
 # CONFIG_INPUT_BMA150 is not set
 CONFIG_INPUT_MAX8925_ONKEY=m
 CONFIG_INPUT_MMA8450=m
@@ -2473,7 +2524,6 @@ CONFIG_INPUT_ADXL34X_I2C=m
 CONFIG_INPUT_IMS_PCU=m
 CONFIG_INPUT_CMA3000=m
 CONFIG_INPUT_CMA3000_I2C=m
-CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y
 
 #
 # Hardware I/O ports
@@ -2488,6 +2538,7 @@ CONFIG_SERIO_ALTERA_PS2=m
 CONFIG_SERIO_PS2MULT=m
 # CONFIG_SERIO_ARC_PS2 is not set
 # CONFIG_SERIO_APBPS2 is not set
+# CONFIG_SERIO_OLPC_APSP is not set
 CONFIG_GAMEPORT=m
 CONFIG_GAMEPORT_NS558=m
 CONFIG_GAMEPORT_L4=m
@@ -2512,7 +2563,6 @@ CONFIG_N_GSM=m
 CONFIG_TRACE_ROUTER=m
 CONFIG_TRACE_SINK=m
 CONFIG_DEVKMEM=y
-CONFIG_STALDRV=y
 
 #
 # Serial drivers
@@ -2536,6 +2586,7 @@ CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
 # CONFIG_SERIAL_KGDB_NMI is not set
 CONFIG_SERIAL_IMX=y
 CONFIG_SERIAL_IMX_CONSOLE=y
+# CONFIG_SERIAL_UARTLITE is not set
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_CONSOLE_POLL=y
@@ -2552,13 +2603,11 @@ CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
 CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
 CONFIG_SERIAL_XILINX_PS_UART=m
 # CONFIG_SERIAL_ARC is not set
+# CONFIG_SERIAL_FSL_LPUART is not set
 CONFIG_PRINTER=m
 # CONFIG_LP_CONSOLE is not set
 CONFIG_PPDEV=m
 CONFIG_HVC_DRIVER=y
-CONFIG_HVC_IRQ=y
-CONFIG_HVC_XEN=y
-CONFIG_HVC_XEN_FRONTEND=y
 # CONFIG_HVC_DCC is not set
 CONFIG_VIRTIO_CONSOLE=m
 CONFIG_IPMI_HANDLER=m
@@ -2616,6 +2665,7 @@ CONFIG_I2C_OMAP=y
 # CONFIG_I2C_PXA_PCI is not set
 # CONFIG_I2C_SIMTEC is not set
 CONFIG_I2C_VERSATILE=m
+# CONFIG_I2C_WMT is not set
 # CONFIG_I2C_XILINX is not set
 
 #
@@ -2636,11 +2686,6 @@ CONFIG_I2C_STUB=m
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
 # CONFIG_SPI is not set
-
-#
-# Qualcomm MSM SSBI bus support
-#
-CONFIG_SSBI=m
 # CONFIG_HSI is not set
 
 #
@@ -2684,8 +2729,6 @@ CONFIG_PINCTRL_IMX53=y
 CONFIG_PINCTRL_IMX6Q=y
 # CONFIG_PINCTRL_SINGLE is not set
 CONFIG_PINCTRL_SUNXI=y
-# CONFIG_PINCTRL_EXYNOS is not set
-CONFIG_PINCTRL_EXYNOS5440=y
 CONFIG_PINCTRL_MVEBU=y
 CONFIG_PINCTRL_ARMADA_370=y
 CONFIG_PINCTRL_ARMADA_XP=y
@@ -2713,6 +2756,7 @@ CONFIG_GPIO_MXC=y
 CONFIG_GPIO_PL061=y
 CONFIG_GPIO_RCAR=m
 # CONFIG_GPIO_TS5500 is not set
+# CONFIG_GPIO_XILINX is not set
 CONFIG_GPIO_GRGPIO=m
 
 #
@@ -2865,6 +2909,7 @@ CONFIG_SENSORS_F71805F=m
 CONFIG_SENSORS_F71882FG=m
 CONFIG_SENSORS_F75375S=m
 CONFIG_SENSORS_G760A=m
+# CONFIG_SENSORS_G762 is not set
 CONFIG_SENSORS_GL518SM=m
 CONFIG_SENSORS_GL520SM=m
 CONFIG_SENSORS_GPIO_FAN=m
@@ -2967,6 +3012,11 @@ CONFIG_THERMAL_GOV_USER_SPACE=y
 CONFIG_CPU_THERMAL=y
 CONFIG_THERMAL_EMULATION=y
 CONFIG_ARMADA_THERMAL=m
+
+#
+# Texas Instruments thermal drivers
+#
+# CONFIG_TI_SOC_THERMAL is not set
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_CORE=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -2981,12 +3031,11 @@ CONFIG_WM831X_WATCHDOG=m
 CONFIG_WM8350_WATCHDOG=m
 CONFIG_ARM_SP805_WATCHDOG=m
 CONFIG_DW_WATCHDOG=m
-CONFIG_MPCORE_WATCHDOG=m
 CONFIG_OMAP_WATCHDOG=m
 CONFIG_TWL4030_WATCHDOG=m
 CONFIG_MAX63XX_WATCHDOG=m
 CONFIG_IMX2_WDT=m
-CONFIG_XEN_WDT=m
+# CONFIG_MEN_A21_WDT is not set
 
 #
 # USB-based Watchdog Cards
@@ -3030,6 +3079,7 @@ CONFIG_MFD_DA9055=y
 CONFIG_HTC_EGPIO=y
 CONFIG_HTC_PASIC3=m
 CONFIG_HTC_I2CPLD=y
+# CONFIG_MFD_KEMPLD is not set
 CONFIG_MFD_88PM800=m
 CONFIG_MFD_88PM805=m
 CONFIG_MFD_88PM860X=y
@@ -3087,6 +3137,7 @@ CONFIG_MFD_ARIZONA=y
 CONFIG_MFD_ARIZONA_I2C=m
 # CONFIG_MFD_WM5102 is not set
 # CONFIG_MFD_WM5110 is not set
+# CONFIG_MFD_WM8997 is not set
 CONFIG_MFD_WM8400=y
 CONFIG_MFD_WM831X=y
 CONFIG_MFD_WM831X_I2C=y
@@ -3103,6 +3154,7 @@ CONFIG_REGULATOR_USERSPACE_CONSUMER=m
 # CONFIG_REGULATOR_GPIO is not set
 CONFIG_REGULATOR_AD5398=m
 CONFIG_REGULATOR_AAT2870=m
+# CONFIG_REGULATOR_ARIZONA is not set
 CONFIG_REGULATOR_DA903X=m
 CONFIG_REGULATOR_DA9052=m
 CONFIG_REGULATOR_DA9055=m
@@ -3120,6 +3172,7 @@ CONFIG_REGULATOR_MAX8952=m
 CONFIG_REGULATOR_MAX8997=m
 CONFIG_REGULATOR_MAX8998=m
 CONFIG_REGULATOR_MAX77686=m
+# CONFIG_REGULATOR_MAX77693 is not set
 CONFIG_REGULATOR_LP3971=m
 CONFIG_REGULATOR_LP3972=m
 CONFIG_REGULATOR_LP872X=y
@@ -3141,6 +3194,7 @@ CONFIG_REGULATOR_TPS65910=m
 CONFIG_REGULATOR_TPS65912=m
 CONFIG_REGULATOR_TPS80031=m
 CONFIG_REGULATOR_TWL4030=y
+# CONFIG_REGULATOR_TI_ABB is not set
 CONFIG_REGULATOR_VEXPRESS=y
 CONFIG_REGULATOR_WM831X=m
 CONFIG_REGULATOR_WM8350=m
@@ -3268,6 +3322,7 @@ CONFIG_USB_ZR364XX=m
 CONFIG_USB_STKWEBCAM=m
 CONFIG_USB_S2255=m
 CONFIG_USB_SN9C102=m
+# CONFIG_VIDEO_USBTV is not set
 
 #
 # Analog TV USB devices
@@ -3381,6 +3436,7 @@ CONFIG_RADIO_ADAPTERS=y
 CONFIG_RADIO_SI470X=y
 CONFIG_USB_SI470X=m
 CONFIG_I2C_SI470X=m
+# CONFIG_RADIO_SI476X is not set
 CONFIG_USB_MR800=m
 CONFIG_USB_DSBR=m
 CONFIG_RADIO_SHARK=m
@@ -3641,6 +3697,8 @@ CONFIG_DRM_I2C_SIL164=m
 CONFIG_DRM_I2C_NXP_TDA998X=m
 # CONFIG_DRM_EXYNOS is not set
 CONFIG_DRM_UDL=m
+# CONFIG_DRM_RCAR_DU is not set
+# CONFIG_DRM_SHMOBILE is not set
 CONFIG_DRM_OMAP=y
 CONFIG_DRM_OMAP_NUM_CRTCS=1
 CONFIG_DRM_TILCDC=y
@@ -3685,9 +3743,9 @@ CONFIG_FB_TMIO_ACCELL=y
 CONFIG_FB_SM501=m
 # CONFIG_FB_SMSCUFX is not set
 CONFIG_FB_UDL=m
+# CONFIG_FB_XILINX is not set
 CONFIG_FB_GOLDFISH=m
 CONFIG_FB_VIRTUAL=m
-CONFIG_XEN_FBDEV_FRONTEND=y
 CONFIG_FB_METRONOME=m
 CONFIG_FB_MX3=m
 CONFIG_FB_BROADSHEET=m
@@ -3701,19 +3759,32 @@ CONFIG_OMAP2_DSS_DPI=y
 CONFIG_OMAP2_DSS_RFBI=y
 CONFIG_OMAP2_DSS_VENC=y
 CONFIG_OMAP4_DSS_HDMI=y
+CONFIG_OMAP4_DSS_HDMI_AUDIO=y
 CONFIG_OMAP2_DSS_SDI=y
 CONFIG_OMAP2_DSS_DSI=y
 CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK=0
 CONFIG_OMAP2_DSS_SLEEP_AFTER_VENC_RESET=y
 
 #
-# OMAP2/3 Display Device Drivers
+# OMAP2/3 Display Device Drivers (old device model)
 #
 CONFIG_PANEL_GENERIC_DPI=m
 CONFIG_PANEL_TFP410=m
 CONFIG_PANEL_SHARP_LS037V7DW01=m
 CONFIG_PANEL_PICODLP=m
 CONFIG_PANEL_TAAL=m
+
+#
+# OMAP Display Device Drivers (new device model)
+#
+CONFIG_DISPLAY_ENCODER_TFP410=m
+CONFIG_DISPLAY_ENCODER_TPD12S015=m
+CONFIG_DISPLAY_CONNECTOR_DVI=m
+CONFIG_DISPLAY_CONNECTOR_HDMI=m
+CONFIG_DISPLAY_CONNECTOR_ANALOG_TV=m
+CONFIG_DISPLAY_PANEL_DPI=m
+CONFIG_DISPLAY_PANEL_DSI_CM=m
+CONFIG_DISPLAY_PANEL_SHARP_LS037V7DW01=m
 # CONFIG_EXYNOS_VIDEO is not set
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_LCD_CLASS_DEVICE=m
@@ -3745,17 +3816,6 @@ CONFIG_DUMMY_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-CONFIG_FONTS=y
-CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y
-# CONFIG_FONT_6x11 is not set
-# CONFIG_FONT_7x14 is not set
-# CONFIG_FONT_PEARL_8x8 is not set
-# CONFIG_FONT_ACORN_8x8 is not set
-# CONFIG_FONT_MINI_4x6 is not set
-# CONFIG_FONT_SUN8x16 is not set
-# CONFIG_FONT_SUN12x22 is not set
-# CONFIG_FONT_10x18 is not set
 CONFIG_LOGO=y
 CONFIG_LOGO_LINUX_MONO=y
 CONFIG_LOGO_LINUX_VGA16=y
@@ -3769,6 +3829,8 @@ CONFIG_SND_TIMER=m
 CONFIG_SND_PCM=m
 CONFIG_SND_HWDEP=m
 CONFIG_SND_RAWMIDI=m
+CONFIG_SND_COMPRESS_OFFLOAD=m
+CONFIG_SND_JACK=y
 CONFIG_SND_SEQUENCER=m
 CONFIG_SND_SEQ_DUMMY=m
 CONFIG_SND_OSSEMUL=y
@@ -3779,6 +3841,7 @@ CONFIG_SND_SEQUENCER_OSS=y
 CONFIG_SND_HRTIMER=m
 CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
 CONFIG_SND_DYNAMIC_MINORS=y
+CONFIG_SND_MAX_CARDS=32
 CONFIG_SND_SUPPORT_OLD_API=y
 CONFIG_SND_VERBOSE_PROCFS=y
 CONFIG_SND_VERBOSE_PRINTK=y
@@ -3813,7 +3876,31 @@ CONFIG_SND_USB_UA101=m
 CONFIG_SND_USB_CAIAQ=m
 CONFIG_SND_USB_CAIAQ_INPUT=y
 CONFIG_SND_USB_6FIRE=m
-# CONFIG_SND_SOC is not set
+# CONFIG_SND_USB_HIFACE is not set
+CONFIG_SND_SOC=m
+CONFIG_SND_SOC_DMAENGINE_PCM=y
+CONFIG_SND_ATMEL_SOC=m
+CONFIG_SND_DESIGNWARE_I2S=m
+# CONFIG_SND_IMX_SOC is not set
+CONFIG_SND_OMAP_SOC=m
+CONFIG_SND_OMAP_SOC_DMIC=m
+CONFIG_SND_OMAP_SOC_MCBSP=m
+CONFIG_SND_OMAP_SOC_MCPDM=m
+CONFIG_SND_OMAP_SOC_HDMI=m
+# CONFIG_SND_OMAP_SOC_RX51 is not set
+CONFIG_SND_OMAP_SOC_AM3517EVM=m
+CONFIG_SND_OMAP_SOC_OMAP_TWL4030=m
+CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040=m
+CONFIG_SND_OMAP_SOC_OMAP_HDMI=m
+CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=m
+CONFIG_SND_SOC_I2C_AND_SPI=m
+# CONFIG_SND_SOC_ALL_CODECS is not set
+CONFIG_SND_SOC_DMIC=m
+CONFIG_SND_SOC_HDMI_CODEC=m
+CONFIG_SND_SOC_TLV320AIC23=m
+CONFIG_SND_SOC_TWL4030=m
+CONFIG_SND_SOC_TWL6040=m
+CONFIG_SND_SIMPLE_CARD=m
 CONFIG_SOUND_PRIME=m
 CONFIG_AC97_BUS=m
 
@@ -3821,7 +3908,7 @@ CONFIG_AC97_BUS=m
 # HID support
 #
 CONFIG_HID=y
-# CONFIG_HID_BATTERY_STRENGTH is not set
+CONFIG_HID_BATTERY_STRENGTH=y
 CONFIG_HIDRAW=y
 CONFIG_UHID=m
 CONFIG_HID_GENERIC=y
@@ -3844,9 +3931,11 @@ CONFIG_HID_DRAGONRISE=m
 CONFIG_DRAGONRISE_FF=y
 CONFIG_HID_EMS_FF=m
 CONFIG_HID_ELECOM=m
+# CONFIG_HID_ELO is not set
 CONFIG_HID_EZKEY=y
 CONFIG_HID_HOLTEK=m
 CONFIG_HOLTEK_FF=y
+# CONFIG_HID_HUION is not set
 CONFIG_HID_KEYTOUCH=m
 CONFIG_HID_KYE=m
 CONFIG_HID_UCLOGIC=m
@@ -3879,7 +3968,6 @@ CONFIG_HID_PICOLCD_LCD=y
 CONFIG_HID_PICOLCD_LEDS=y
 CONFIG_HID_PICOLCD_CIR=y
 # CONFIG_HID_PRIMAX is not set
-CONFIG_HID_PS3REMOTE=m
 CONFIG_HID_ROCCAT=m
 CONFIG_HID_SAITEK=m
 CONFIG_HID_SAMSUNG=m
@@ -3898,7 +3986,6 @@ CONFIG_HID_THRUSTMASTER=m
 CONFIG_THRUSTMASTER_FF=y
 CONFIG_HID_WACOM=m
 CONFIG_HID_WIIMOTE=m
-CONFIG_HID_WIIMOTE_EXT=y
 CONFIG_HID_ZEROPLUS=m
 CONFIG_ZEROPLUS_FF=y
 CONFIG_HID_ZYDACRON=m
@@ -3915,9 +4002,7 @@ CONFIG_USB_HIDDEV=y
 # I2C HID support
 #
 CONFIG_I2C_HID=m
-CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARCH_HAS_EHCI=y
-# CONFIG_USB_ARCH_HAS_XHCI is not set
 CONFIG_USB_SUPPORT=y
 CONFIG_USB_COMMON=m
 CONFIG_USB_ARCH_HAS_HCD=y
@@ -3939,6 +4024,7 @@ CONFIG_USB_WUSB_CBAF=m
 # USB Host Controller Drivers
 #
 CONFIG_USB_C67X00_HCD=m
+# CONFIG_USB_XHCI_HCD is not set
 CONFIG_USB_EHCI_HCD=m
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TT_NEWSCHED=y
@@ -3951,10 +4037,11 @@ CONFIG_USB_OXU210HP_HCD=m
 CONFIG_USB_ISP116X_HCD=m
 CONFIG_USB_ISP1760_HCD=m
 CONFIG_USB_ISP1362_HCD=m
+# CONFIG_USB_FUSBH200_HCD is not set
 CONFIG_USB_OHCI_HCD=m
 CONFIG_USB_OHCI_HCD_OMAP3=y
 CONFIG_USB_OHCI_HCD_SSB=y
-CONFIG_USB_OHCI_HCD_PLATFORM=y
+CONFIG_USB_OHCI_HCD_PLATFORM=m
 # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
 # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
@@ -4073,6 +4160,8 @@ CONFIG_USB_SERIAL_WISHBONE=m
 CONFIG_USB_SERIAL_ZTE=m
 CONFIG_USB_SERIAL_SSU100=m
 # CONFIG_USB_SERIAL_QT2 is not set
+# CONFIG_USB_SERIAL_FLASHLOADER is not set
+# CONFIG_USB_SERIAL_SUUNTO is not set
 CONFIG_USB_SERIAL_DEBUG=m
 
 #
@@ -4119,6 +4208,7 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
 #
 CONFIG_USB_FSL_USB2=m
 CONFIG_USB_FUSB300=m
+# CONFIG_USB_FOTG210_UDC is not set
 # CONFIG_USB_R8A66597 is not set
 # CONFIG_USB_PXA27X is not set
 # CONFIG_USB_MV_UDC is not set
@@ -4127,6 +4217,12 @@ CONFIG_USB_MV_U3D=m
 # CONFIG_USB_NET2272 is not set
 # CONFIG_USB_DUMMY_HCD is not set
 CONFIG_USB_LIBCOMPOSITE=m
+CONFIG_USB_U_ETHER=m
+CONFIG_USB_U_RNDIS=m
+CONFIG_USB_F_ECM=m
+CONFIG_USB_F_SUBSET=m
+CONFIG_USB_F_RNDIS=m
+# CONFIG_USB_CONFIGFS is not set
 # CONFIG_USB_ZERO is not set
 # CONFIG_USB_AUDIO is not set
 CONFIG_USB_ETH=m
@@ -4171,6 +4267,7 @@ CONFIG_MMC_SDHCI_PLTFM=m
 CONFIG_MMC_SDHCI_ESDHC_IMX=m
 CONFIG_MMC_SDHCI_PXAV3=m
 CONFIG_MMC_SDHCI_PXAV2=m
+# CONFIG_MMC_SDHCI_BCM_KONA is not set
 CONFIG_MMC_OMAP=m
 CONFIG_MMC_OMAP_HS=m
 CONFIG_MMC_MXC=m
@@ -4287,6 +4384,7 @@ CONFIG_RTC_DRV_ISL1208=y
 CONFIG_RTC_DRV_ISL12022=y
 CONFIG_RTC_DRV_X1205=y
 CONFIG_RTC_DRV_PALMAS=y
+# CONFIG_RTC_DRV_PCF2127 is not set
 CONFIG_RTC_DRV_PCF8523=y
 CONFIG_RTC_DRV_PCF8563=y
 CONFIG_RTC_DRV_PCF8583=y
@@ -4355,12 +4453,13 @@ CONFIG_DMADEVICES=y
 #
 CONFIG_ASYNC_TX_ENABLE_CHANNEL_SWITCH=y
 CONFIG_AMBA_PL08X=y
+CONFIG_DW_DMAC_CORE=m
 CONFIG_DW_DMAC=m
-# CONFIG_DW_DMAC_BIG_ENDIAN_IO is not set
 CONFIG_MV_XOR=y
 CONFIG_MX3_IPU=y
 CONFIG_MX3_IPU_IRQS=4
 CONFIG_TIMB_DMA=m
+# CONFIG_TI_EDMA is not set
 # CONFIG_PL330_DMA is not set
 CONFIG_IMX_SDMA=m
 CONFIG_IMX_DMA=m
@@ -4398,21 +4497,6 @@ CONFIG_VIRTIO_MMIO=m
 #
 # Microsoft Hyper-V guest support
 #
-
-#
-# Xen driver support
-#
-CONFIG_XEN_BALLOON=y
-CONFIG_XEN_SCRUB_PAGES=y
-CONFIG_XEN_DEV_EVTCHN=m
-CONFIG_PARAVIRT_XEN_BACKEND=y
-CONFIG_XENFS=m
-CONFIG_XEN_COMPAT_XENFS=y
-CONFIG_XEN_SYS_HYPERVISOR=y
-CONFIG_XEN_XENBUS_FRONTEND=y
-CONFIG_XEN_GNTDEV=m
-CONFIG_XEN_GRANT_DEV_ALLOC=m
-CONFIG_XEN_PRIVCMD=m
 CONFIG_STAGING=y
 CONFIG_USBIP_CORE=m
 CONFIG_USBIP_VHCI_HCD=m
@@ -4508,8 +4592,6 @@ CONFIG_ADE7854_I2C=m
 # Triggers - standalone
 #
 CONFIG_IIO_PERIODIC_RTC_TRIGGER=m
-CONFIG_IIO_GPIO_TRIGGER=m
-CONFIG_IIO_SYSFS_TRIGGER=m
 CONFIG_IIO_SIMPLE_DUMMY=m
 # CONFIG_IIO_SIMPLE_DUMMY_EVENTS is not set
 # CONFIG_IIO_SIMPLE_DUMMY_BUFFER is not set
@@ -4553,17 +4635,18 @@ CONFIG_STAGING_MEDIA=y
 # CONFIG_ANDROID is not set
 CONFIG_USB_WPAN_HCD=m
 # CONFIG_WIMAX_GDM72XX is not set
-CONFIG_CSR_WIFI=m
 CONFIG_CED1401=m
 CONFIG_DRM_IMX=y
 CONFIG_DRM_IMX_FB_HELPER=m
 CONFIG_DRM_IMX_PARALLEL_DISPLAY=m
 CONFIG_DRM_IMX_TVE=m
+# CONFIG_DRM_IMX_LDB is not set
 CONFIG_DRM_IMX_IPUV3_CORE=y
 CONFIG_DRM_IMX_IPUV3=y
 CONFIG_DGRP=m
 CONFIG_ZCACHE=y
 # CONFIG_ZCACHE_DEBUG is not set
+# CONFIG_USB_BTMTK is not set
 CONFIG_CLKDEV_LOOKUP=y
 CONFIG_HAVE_CLK_PREPARE=y
 CONFIG_COMMON_CLK=y
@@ -4578,9 +4661,10 @@ CONFIG_COMMON_CLK_MAX77686=m
 # CONFIG_COMMON_CLK_SI5351 is not set
 CONFIG_CLK_TWL6040=m
 # CONFIG_COMMON_CLK_AXI_CLKGEN is not set
-CONFIG_MVEBU_CLK_CORE=y
+CONFIG_MVEBU_CLK_COMMON=y
 CONFIG_MVEBU_CLK_CPU=y
-CONFIG_MVEBU_CLK_GATING=y
+CONFIG_ARMADA_370_CLK=y
+CONFIG_ARMADA_XP_CLK=y
 CONFIG_HWSPINLOCK=y
 
 #
@@ -4598,6 +4682,9 @@ CONFIG_CADENCE_TTC_TIMER=y
 CONFIG_ARM_ARCH_TIMER=y
 CONFIG_MAILBOX=y
 CONFIG_PL320_MBOX=y
+CONFIG_OMAP_MBOX=m
+CONFIG_OMAP2PLUS_MBOX=m
+CONFIG_OMAP_MBOX_KFIFO_SIZE=256
 CONFIG_IOMMU_API=y
 CONFIG_IOMMU_SUPPORT=y
 CONFIG_OF_IOMMU=y
@@ -4609,11 +4696,13 @@ CONFIG_OMAP_IOMMU_DEBUG=m
 # Remoteproc drivers
 #
 CONFIG_REMOTEPROC=m
+CONFIG_OMAP_REMOTEPROC=m
 CONFIG_STE_MODEM_RPROC=m
 
 #
 # Rpmsg drivers
 #
+CONFIG_RPMSG=m
 # CONFIG_PM_DEVFREQ is not set
 # CONFIG_EXTCON is not set
 # CONFIG_MEMORY is not set
@@ -4704,8 +4793,21 @@ CONFIG_HID_SENSOR_ALS=m
 CONFIG_HID_SENSOR_MAGNETOMETER_3D=m
 CONFIG_IIO_ST_MAGN_3AXIS=m
 CONFIG_IIO_ST_MAGN_I2C_3AXIS=m
+
+#
+# Triggers - standalone
+#
+# CONFIG_IIO_INTERRUPT_TRIGGER is not set
+CONFIG_IIO_SYSFS_TRIGGER=m
+
+#
+# Pressure Sensors
+#
+# CONFIG_IIO_ST_PRESS is not set
 CONFIG_PWM=y
+CONFIG_PWM_SYSFS=y
 CONFIG_PWM_IMX=m
+# CONFIG_PWM_PCA9685 is not set
 CONFIG_PWM_TIECAP=m
 CONFIG_PWM_TIEHRPWM=m
 CONFIG_PWM_TIPWMSS=y
@@ -4717,6 +4819,7 @@ CONFIG_ARM_GIC=y
 # CONFIG_IPACK_BUS is not set
 CONFIG_ARCH_HAS_RESET_CONTROLLER=y
 CONFIG_RESET_CONTROLLER=y
+# CONFIG_FMC is not set
 
 #
 # File systems
@@ -4898,6 +5001,7 @@ CONFIG_F2FS_FS=m
 CONFIG_F2FS_STAT_FS=y
 CONFIG_F2FS_FS_XATTR=y
 CONFIG_F2FS_FS_POSIX_ACL=y
+# CONFIG_F2FS_FS_SECURITY is not set
 CONFIG_ORE=m
 CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=m
@@ -4907,6 +5011,7 @@ CONFIG_NFS_V3_ACL=y
 CONFIG_NFS_V4=m
 CONFIG_NFS_SWAP=y
 CONFIG_NFS_V4_1=y
+# CONFIG_NFS_V4_2 is not set
 CONFIG_PNFS_FILE_LAYOUT=m
 CONFIG_PNFS_BLOCK=m
 CONFIG_PNFS_OBJLAYOUT=m
@@ -4920,6 +5025,7 @@ CONFIG_NFSD_V2_ACL=y
 CONFIG_NFSD_V3=y
 CONFIG_NFSD_V3_ACL=y
 CONFIG_NFSD_V4=y
+# CONFIG_NFSD_V4_SECURITY_LABEL is not set
 # CONFIG_NFSD_FAULT_INJECTION is not set
 CONFIG_LOCKD=m
 CONFIG_LOCKD_V4=y
@@ -4960,6 +5066,7 @@ CONFIG_AFS_FSCACHE=y
 CONFIG_9P_FS=m
 # CONFIG_9P_FSCACHE is not set
 CONFIG_9P_FS_POSIX_ACL=y
+# CONFIG_9P_FS_SECURITY is not set
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="utf8"
 CONFIG_NLS_CODEPAGE_437=m
@@ -5017,61 +5124,85 @@ CONFIG_DLM_DEBUG=y
 #
 # Kernel hacking
 #
+
+#
+# printk and dmesg options
+#
 CONFIG_PRINTK_TIME=y
 CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
+# CONFIG_BOOT_PRINTK_DELAY is not set
+CONFIG_DYNAMIC_DEBUG=y
+
+#
+# Compile-time checks and compiler options
+#
+CONFIG_DEBUG_INFO=y
+# CONFIG_DEBUG_INFO_REDUCED is not set
 CONFIG_ENABLE_WARN_DEPRECATED=y
 CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_FRAME_WARN=2048
-CONFIG_MAGIC_SYSRQ=y
 CONFIG_STRIP_ASM_SYMS=y
 # CONFIG_READABLE_ASM is not set
 CONFIG_UNUSED_SYMBOLS=y
 CONFIG_DEBUG_FS=y
 CONFIG_HEADERS_CHECK=y
 CONFIG_DEBUG_SECTION_MISMATCH=y
+CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y
+CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_KERNEL=y
+
+#
+# Memory Debugging
+#
+# CONFIG_DEBUG_PAGEALLOC is not set
+# CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_DEBUG_SLAB is not set
+CONFIG_HAVE_DEBUG_KMEMLEAK=y
+# CONFIG_DEBUG_KMEMLEAK is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_DEBUG_VM is not set
+CONFIG_DEBUG_MEMORY_INIT=y
+# CONFIG_DEBUG_PER_CPU_MAPS is not set
+# CONFIG_DEBUG_HIGHMEM is not set
 # CONFIG_DEBUG_SHIRQ is not set
+
+#
+# Debug Lockups and Hangs
+#
 CONFIG_LOCKUP_DETECTOR=y
 # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
 CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
-# CONFIG_PANIC_ON_OOPS is not set
-CONFIG_PANIC_ON_OOPS_VALUE=0
 CONFIG_DETECT_HUNG_TASK=y
 CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=480
 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
 CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
+# CONFIG_PANIC_ON_OOPS is not set
+CONFIG_PANIC_ON_OOPS_VALUE=0
 CONFIG_SCHED_DEBUG=y
 CONFIG_SCHEDSTATS=y
 CONFIG_TIMER_STATS=y
-# CONFIG_DEBUG_OBJECTS is not set
-# CONFIG_DEBUG_SLAB is not set
-CONFIG_HAVE_DEBUG_KMEMLEAK=y
-# CONFIG_DEBUG_KMEMLEAK is not set
+
+#
+# Lock Debugging (spinlocks, mutexes, etc...)
+#
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
 # CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
 # CONFIG_DEBUG_LOCK_ALLOC is not set
 # CONFIG_PROVE_LOCKING is not set
 # CONFIG_LOCK_STAT is not set
 # CONFIG_DEBUG_ATOMIC_SLEEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 CONFIG_STACKTRACE=y
-# CONFIG_DEBUG_STACK_USAGE is not set
 # CONFIG_DEBUG_KOBJECT is not set
-# CONFIG_DEBUG_HIGHMEM is not set
 CONFIG_DEBUG_BUGVERBOSE=y
-CONFIG_DEBUG_INFO=y
-# CONFIG_DEBUG_INFO_REDUCED is not set
-# CONFIG_DEBUG_VM is not set
 # CONFIG_DEBUG_WRITECOUNT is not set
-CONFIG_DEBUG_MEMORY_INIT=y
 # CONFIG_DEBUG_LIST is not set
-# CONFIG_TEST_LIST_SORT is not set
 # CONFIG_DEBUG_SG is not set
 # CONFIG_DEBUG_NOTIFIERS is not set
 # CONFIG_DEBUG_CREDENTIALS is not set
-# CONFIG_BOOT_PRINTK_DELAY is not set
 
 #
 # RCU Debugging
@@ -5081,17 +5212,11 @@ CONFIG_DEBUG_MEMORY_INIT=y
 CONFIG_RCU_CPU_STALL_TIMEOUT=21
 # CONFIG_RCU_CPU_STALL_INFO is not set
 # CONFIG_RCU_TRACE is not set
-# CONFIG_KPROBES_SANITY_TEST is not set
-# CONFIG_BACKTRACE_SELF_TEST is not set
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
-CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y
-# CONFIG_DEBUG_PER_CPU_MAPS is not set
-CONFIG_LKDTM=m
 CONFIG_NOTIFIER_ERROR_INJECTION=m
 # CONFIG_CPU_NOTIFIER_ERROR_INJECT is not set
 CONFIG_PM_NOTIFIER_ERROR_INJECT=m
 # CONFIG_FAULT_INJECTION is not set
-# CONFIG_DEBUG_PAGEALLOC is not set
 CONFIG_NOP_TRACER=y
 CONFIG_HAVE_FUNCTION_TRACER=y
 CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
@@ -5125,13 +5250,22 @@ CONFIG_PROBE_EVENTS=y
 # CONFIG_FTRACE_STARTUP_TEST is not set
 CONFIG_RING_BUFFER_BENCHMARK=m
 # CONFIG_RING_BUFFER_STARTUP_TEST is not set
+
+#
+# Runtime Testing
+#
+CONFIG_LKDTM=m
+# CONFIG_TEST_LIST_SORT is not set
+# CONFIG_KPROBES_SANITY_TEST is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
 CONFIG_RBTREE_TEST=m
 CONFIG_INTERVAL_TREE_TEST=m
-CONFIG_BUILD_DOCSRC=y
-CONFIG_DYNAMIC_DEBUG=y
-# CONFIG_DMA_API_DEBUG is not set
 # CONFIG_ATOMIC64_SELFTEST is not set
 CONFIG_ASYNC_RAID6_TEST=m
+# CONFIG_TEST_STRING_HELPERS is not set
+# CONFIG_TEST_KSTRTOX is not set
+CONFIG_BUILD_DOCSRC=y
+# CONFIG_DMA_API_DEBUG is not set
 # CONFIG_SAMPLES is not set
 CONFIG_HAVE_ARCH_KGDB=y
 CONFIG_KGDB=y
@@ -5140,8 +5274,6 @@ CONFIG_KGDB_SERIAL_CONSOLE=m
 CONFIG_KGDB_KDB=y
 CONFIG_KDB_KEYBOARD=y
 CONFIG_KDB_CONTINUE_CATASTROPHIC=0
-# CONFIG_TEST_STRING_HELPERS is not set
-# CONFIG_TEST_KSTRTOX is not set
 # CONFIG_STRICT_DEVMEM is not set
 CONFIG_ARM_UNWIND=y
 CONFIG_DEBUG_USER=y
@@ -5300,6 +5432,8 @@ CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_ZLIB=m
 CONFIG_CRYPTO_LZO=y
+# CONFIG_CRYPTO_LZ4 is not set
+# CONFIG_CRYPTO_LZ4HC is not set
 
 #
 # Random Number Generation
@@ -5312,6 +5446,7 @@ CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_MV_CESA=m
 CONFIG_CRYPTO_DEV_OMAP_SHAM=m
 CONFIG_CRYPTO_DEV_OMAP_AES=m
+# CONFIG_CRYPTO_DEV_SAHARA is not set
 CONFIG_ASYMMETRIC_KEY_TYPE=m
 CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m
 CONFIG_PUBLIC_KEY_ALGO_RSA=m
@@ -5326,6 +5461,7 @@ CONFIG_BITREVERSE=y
 CONFIG_RATIONAL=y
 CONFIG_GENERIC_STRNCPY_FROM_USER=y
 CONFIG_GENERIC_STRNLEN_USER=y
+CONFIG_GENERIC_NET_UTILS=y
 CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_GENERIC_IO=y
 CONFIG_STMP_DEVICE=y
@@ -5347,6 +5483,7 @@ CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
 CONFIG_LZO_COMPRESS=y
 CONFIG_LZO_DECOMPRESS=y
+CONFIG_LZ4_DECOMPRESS=y
 CONFIG_XZ_DEC=y
 CONFIG_XZ_DEC_X86=y
 CONFIG_XZ_DEC_POWERPC=y
@@ -5361,6 +5498,7 @@ CONFIG_DECOMPRESS_BZIP2=y
 CONFIG_DECOMPRESS_LZMA=y
 CONFIG_DECOMPRESS_XZ=y
 CONFIG_DECOMPRESS_LZO=y
+CONFIG_DECOMPRESS_LZ4=y
 CONFIG_GENERIC_ALLOCATOR=y
 CONFIG_REED_SOLOMON=m
 CONFIG_REED_SOLOMON_DEC16=y
@@ -5383,9 +5521,16 @@ CONFIG_CORDIC=m
 # CONFIG_DDR is not set
 CONFIG_MPILIB=m
 CONFIG_OID_REGISTRY=m
+CONFIG_FONT_SUPPORT=y
+CONFIG_FONTS=y
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_7x14 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+# CONFIG_FONT_MINI_4x6 is not set
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+# CONFIG_FONT_10x18 is not set
 CONFIG_VIRTUALIZATION=y
-CONFIG_KVM_ARM_MAX_VCPUS=0
-
-#
-# Virtio drivers
-#
-- 
1.7.10.4

