LINARO: Update configs

Signed-off-by: John Rigby <john.rigby@linaro.org>

3 files changed, 57 insertions, 31 deletions

diff --git a/debian.linaro/config/armel/config.flavour.linaro-omap b/debian.linaro/config/armel/config.flavour.linaro-omap
index 4f0cec37004..496248012ae 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-omap
+++ b/debian.linaro/config/armel/config.flavour.linaro-omap
@@ -24,6 +24,7 @@ CONFIG_MAC80211_RC_DEFAULT="pid"
 # CONFIG_MAC80211_RC_DEFAULT_MINSTREL is not set
 CONFIG_MAC80211_RC_DEFAULT_PID=y
 CONFIG_MFD_CORE=y
+CONFIG_MFD_TWL4030_AUDIO=y
 CONFIG_MMC_UNSAFE_RESUME=y
 # CONFIG_MTD_ARM_INTEGRATOR is not set
 CONFIG_NOP_USB_XCEIV=y
@@ -31,8 +32,8 @@ CONFIG_NR_CPUS=2
 CONFIG_PL310_ERRATA_588369=y
 CONFIG_PL310_ERRATA_727915=y
 CONFIG_SND_DYNAMIC_MINORS=y
-CONFIG_TWL4030_CODEC=y
 CONFIG_TWL4030_CORE=y
+CONFIG_TWL6040_CORE=y
 CONFIG_USB_ARCH_HAS_EHCI=y
 CONFIG_USB_ARCH_HAS_OHCI=y
 # CONFIG_USB_EHCI_ROOT_HUB_TT is not set
diff --git a/debian.linaro/config/armel/config.flavour.linaro-vexpress b/debian.linaro/config/armel/config.flavour.linaro-vexpress
index 2030e40f582..096e61c184e 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-vexpress
+++ b/debian.linaro/config/armel/config.flavour.linaro-vexpress
@@ -24,6 +24,7 @@ CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
 CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
 # CONFIG_MAC80211_RC_DEFAULT_PID is not set
 # CONFIG_MFD_CORE is not set
+# CONFIG_MFD_TWL4030_AUDIO is not set
 # CONFIG_MMC_UNSAFE_RESUME is not set
 CONFIG_MTD_ARM_INTEGRATOR=y
 # CONFIG_NOP_USB_XCEIV is not set
@@ -31,8 +32,8 @@ CONFIG_NR_CPUS=4
 # CONFIG_PL310_ERRATA_588369 is not set
 # CONFIG_PL310_ERRATA_727915 is not set
 # CONFIG_SND_DYNAMIC_MINORS is not set
-# CONFIG_TWL4030_CODEC is not set
 CONFIG_TWL4030_CORE=y
+# CONFIG_TWL6040_CORE is not set
 # CONFIG_USB_ARCH_HAS_EHCI is not set
 # CONFIG_USB_ARCH_HAS_OHCI is not set
 CONFIG_USB_GADGET=y
diff --git a/debian.linaro/config/config.common.ubuntu b/debian.linaro/config/config.common.ubuntu
index 9cfcd09aabb..997e643d8af 100644
--- a/debian.linaro/config/config.common.ubuntu
+++ b/debian.linaro/config/config.common.ubuntu
@@ -40,7 +40,6 @@ CONFIG_ARCH_HAS_OPP=y
 # CONFIG_ARCH_IXP4XX is not set
 # CONFIG_ARCH_KIRKWOOD is not set
 # CONFIG_ARCH_KS8695 is not set
-# CONFIG_ARCH_LOKI is not set
 # CONFIG_ARCH_LPC32XX is not set
 # CONFIG_ARCH_MMP is not set
 # CONFIG_ARCH_MSM is not set
@@ -67,6 +66,7 @@ CONFIG_ARCH_OMAP4=y
 CONFIG_ARCH_OMAP_OTG=y
 # CONFIG_ARCH_ORION5X is not set
 # CONFIG_ARCH_PNX4008 is not set
+# CONFIG_ARCH_PRIMA2 is not set
 # CONFIG_ARCH_PXA is not set
 # CONFIG_ARCH_REALVIEW is not set
 CONFIG_ARCH_REQUIRE_GPIOLIB=y
@@ -93,11 +93,10 @@ CONFIG_ARCH_VEXPRESS_CA9X4=y
 # CONFIG_ARCH_VT8500 is not set
 # CONFIG_ARCH_W90X900 is not set
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
+# CONFIG_ARCH_ZYNQ is not set
 CONFIG_ARM=y
 CONFIG_ARM_AMBA=y
-# CONFIG_ARM_APPENDED_DTB is not set
 CONFIG_ARM_ASM_UNIFIED=y
-CONFIG_ARM_CPU_TOPOLOGY=y
 CONFIG_ARM_DMA_MEM_BUFFERABLE=y
 # CONFIG_ARM_ERRATA_430973 is not set
 # CONFIG_ARM_ERRATA_458693 is not set
@@ -108,6 +107,7 @@ CONFIG_ARM_ERRATA_720789=y
 # CONFIG_ARM_ERRATA_743622 is not set
 # CONFIG_ARM_ERRATA_754322 is not set
 # CONFIG_ARM_ERRATA_754327 is not set
+# CONFIG_ARM_ERRATA_764369 is not set
 CONFIG_ARM_GIC=y
 CONFIG_ARM_L1_CACHE_SHIFT_6=y
 # CONFIG_ARM_PATCH_PHYS_VIRT is not set
@@ -157,6 +157,7 @@ CONFIG_B43_PHY_LP=y
 CONFIG_B43_PHY_N=y
 CONFIG_B43_PIO=y
 # CONFIG_B43_SDIO is not set
+CONFIG_B43_SSB=y
 # CONFIG_B44 is not set
 # CONFIG_BACKLIGHT_ADP8860 is not set
 # CONFIG_BACKLIGHT_ADP8870 is not set
@@ -184,6 +185,7 @@ CONFIG_BITREVERSE=y
 # CONFIG_BLK_CGROUP is not set
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_BSG=y
+# CONFIG_BLK_DEV_BSGLIB is not set
 # CONFIG_BLK_DEV_COW_COMMON is not set
 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
 CONFIG_BLK_DEV_DM=y
@@ -192,6 +194,7 @@ CONFIG_BLK_DEV_INITRD=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 is not set
 # CONFIG_BLK_DEV_NBD is not set
 CONFIG_BLK_DEV_RAM=y
@@ -283,6 +286,7 @@ CONFIG_CMDLINE_FROM_BOOTLOADER=y
 CONFIG_CONNECTOR=y
 CONFIG_CONSOLE_TRANSLATIONS=y
 CONFIG_CONTEXT_SWITCH_TRACER=y
+# CONFIG_CORDIC is not set
 CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 CONFIG_CPUSETS=y
 CONFIG_CPU_32v6K=y
@@ -310,6 +314,7 @@ CONFIG_CRAMFS=y
 CONFIG_CRC16=y
 CONFIG_CRC32=y
 CONFIG_CRC7=y
+# CONFIG_CRC8 is not set
 CONFIG_CRC_CCITT=y
 CONFIG_CRC_ITU_T=y
 CONFIG_CRC_T10DIF=y
@@ -388,6 +393,7 @@ CONFIG_CRYPTO_WORKQUEUE=y
 # CONFIG_CRYPTO_ZLIB is not set
 # CONFIG_DAVICOM_PHY is not set
 # CONFIG_DCB is not set
+# CONFIG_DEBUG_ATOMIC_SLEEP is not set
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
 CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_DEBUG_CREDENTIALS is not set
@@ -422,7 +428,6 @@ CONFIG_DEBUG_PREEMPT=y
 # CONFIG_DEBUG_SHIRQ is not set
 # CONFIG_DEBUG_SLAB is not set
 CONFIG_DEBUG_SPINLOCK=y
-CONFIG_DEBUG_SPINLOCK_SLEEP=y
 # CONFIG_DEBUG_STACK_USAGE is not set
 CONFIG_DEBUG_USER=y
 # CONFIG_DEBUG_VM is not set
@@ -475,6 +480,7 @@ CONFIG_DNS_RESOLVER=y
 CONFIG_DTC=y
 # CONFIG_DUMMY is not set
 CONFIG_DUMMY_CONSOLE=y
+# CONFIG_DW_WATCHDOG is not set
 # CONFIG_DYNAMIC_DEBUG is not set
 CONFIG_DYNAMIC_FTRACE=y
 CONFIG_EARLY_PRINTK=y
@@ -571,6 +577,7 @@ CONFIG_FREEZER=y
 CONFIG_FSNOTIFY=y
 CONFIG_FS_MBCACHE=y
 CONFIG_FS_POSIX_ACL=y
+# CONFIG_FTGMAC100 is not set
 # CONFIG_FTL is not set
 # CONFIG_FTMAC100 is not set
 CONFIG_FTRACE=y
@@ -599,13 +606,15 @@ CONFIG_GENERIC_TRACER=y
 # CONFIG_GFS2_FS is not set
 # CONFIG_GPIO_74X164 is not set
 # CONFIG_GPIO_ADP5588 is not set
-# CONFIG_GPIO_BASIC_MMIO is not set
+CONFIG_GPIO_GENERIC=y
+# CONFIG_GPIO_GENERIC_PLATFORM is not set
 # CONFIG_GPIO_IT8761E is not set
 # CONFIG_GPIO_MAX7300 is not set
 # CONFIG_GPIO_MAX7301 is not set
 # CONFIG_GPIO_MAX732X is not set
 # CONFIG_GPIO_MC33880 is not set
 # CONFIG_GPIO_MCP23S08 is not set
+CONFIG_GPIO_MXC=y
 # CONFIG_GPIO_PCA953X is not set
 # CONFIG_GPIO_PCF857X is not set
 # CONFIG_GPIO_PL061 is not set
@@ -641,6 +650,7 @@ CONFIG_HAVE_KERNEL_LZO=y
 CONFIG_HAVE_KPROBES=y
 CONFIG_HAVE_KRETPROBES=y
 CONFIG_HAVE_LATENCYTOP_SUPPORT=y
+CONFIG_HAVE_MACH_CLKDEV=y
 CONFIG_HAVE_MEMBLOCK=y
 CONFIG_HAVE_OPROFILE=y
 CONFIG_HAVE_PATA_PLATFORM=y
@@ -667,6 +677,7 @@ CONFIG_HID_DRAGONRISE=y
 CONFIG_HID_EZKEY=y
 CONFIG_HID_GREENASIA=y
 CONFIG_HID_GYRATION=y
+# CONFIG_HID_HOLTEK is not set
 CONFIG_HID_KENSINGTON=y
 # CONFIG_HID_KEYTOUCH is not set
 CONFIG_HID_KYE=y
@@ -684,14 +695,10 @@ CONFIG_HID_PETALYNX=y
 # CONFIG_HID_PRODIKEYS is not set
 # CONFIG_HID_QUANTA is not set
 # CONFIG_HID_ROCCAT is not set
-# CONFIG_HID_ROCCAT_ARVO is not set
-# CONFIG_HID_ROCCAT_KONE is not set
-# CONFIG_HID_ROCCAT_KONEPLUS is not set
-# CONFIG_HID_ROCCAT_KOVAPLUS is not set
-# CONFIG_HID_ROCCAT_PYRA is not set
 CONFIG_HID_SAMSUNG=y
 CONFIG_HID_SMARTJOYPLUS=y
 CONFIG_HID_SONY=y
+# CONFIG_HID_SPEEDLINK is not set
 CONFIG_HID_SUNPLUS=y
 CONFIG_HID_SUPPORT=y
 CONFIG_HID_THRUSTMASTER=y
@@ -838,12 +845,15 @@ CONFIG_INPUT_JOYDEV=y
 # CONFIG_INPUT_JOYSTICK is not set
 CONFIG_INPUT_KEYBOARD=y
 # CONFIG_INPUT_KEYSPAN_REMOTE is not set
+# CONFIG_INPUT_KXTJ9 is not set
 CONFIG_INPUT_MISC=y
+# CONFIG_INPUT_MMA8450 is not set
 CONFIG_INPUT_MOUSE=y
 CONFIG_INPUT_MOUSEDEV=m
 CONFIG_INPUT_MOUSEDEV_PSAUX=y
 CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+# CONFIG_INPUT_MPU3050 is not set
 # CONFIG_INPUT_PCF8574 is not set
 # CONFIG_INPUT_POLLDEV is not set
 # CONFIG_INPUT_POWERMATE is not set
@@ -852,8 +862,10 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_INPUT_TWL4030_PWRBUTTON=y
 # CONFIG_INPUT_TWL4030_VIBRA is not set
+# CONFIG_INPUT_TWL6040_VIBRA is not set
 CONFIG_INPUT_UINPUT=y
 # CONFIG_INPUT_YEALINK is not set
+CONFIG_IOMMU_SUPPORT=y
 CONFIG_IOSCHED_CFQ=y
 CONFIG_IOSCHED_DEADLINE=y
 CONFIG_IOSCHED_NOOP=y
@@ -888,6 +900,7 @@ CONFIG_IP_PNP_RARP=y
 # CONFIG_IP_VS is not set
 # CONFIG_IRDA is not set
 # CONFIG_IRQSOFF_TRACER is not set
+CONFIG_IRQ_DOMAIN=y
 CONFIG_IRQ_WORK=y
 # CONFIG_ISCSI_BOOT_SYSFS is not set
 # CONFIG_ISCSI_TCP is not set
@@ -962,6 +975,7 @@ CONFIG_KTIME_SCALAR=y
 # CONFIG_LAPB is not set
 # CONFIG_LATENCYTOP is not set
 CONFIG_LBDAF=y
+# CONFIG_LCD_AMS369FG06 is not set
 CONFIG_LCD_CLASS_DEVICE=y
 # CONFIG_LCD_L4F00242T03 is not set
 # CONFIG_LCD_LD9040 is not set
@@ -977,8 +991,7 @@ CONFIG_LEDS=y
 CONFIG_LEDS_CLASS=y
 # CONFIG_LEDS_DAC124S085 is not set
 CONFIG_LEDS_GPIO=y
-CONFIG_LEDS_GPIO_OF=y
-CONFIG_LEDS_GPIO_PLATFORM=y
+CONFIG_LEDS_GPIO_REGISTER=y
 # CONFIG_LEDS_LM3530 is not set
 # CONFIG_LEDS_LP3944 is not set
 # CONFIG_LEDS_LP5521 is not set
@@ -1046,6 +1059,7 @@ CONFIG_MAC80211_RC_MINSTREL_HT=y
 CONFIG_MAC80211_RC_PID=y
 CONFIG_MACH_CM_T35=y
 CONFIG_MACH_CM_T3517=y
+CONFIG_MACH_CM_T3730=y
 # CONFIG_MACH_CRANEBOARD is not set
 CONFIG_MACH_DEVKIT8000=y
 # CONFIG_MACH_EUKREA_CPUIMX51 is not set
@@ -1085,6 +1099,7 @@ CONFIG_MD=y
 # CONFIG_MEDIA_SUPPORT is not set
 # CONFIG_MEMSTICK is not set
 # CONFIG_MFD_88PM860X is not set
+# CONFIG_MFD_AAT2870_CORE is not set
 # CONFIG_MFD_ASIC3 is not set
 # CONFIG_MFD_MAX8925 is not set
 # CONFIG_MFD_MAX8997 is not set
@@ -1102,6 +1117,8 @@ CONFIG_MFD_SUPPORT=y
 # CONFIG_MFD_TMIO is not set
 # CONFIG_MFD_TPS6586X is not set
 # CONFIG_MFD_TPS65910 is not set
+# CONFIG_MFD_TPS65912_I2C is not set
+# CONFIG_MFD_TPS65912_SPI is not set
 # CONFIG_MFD_WL1273_CORE is not set
 # CONFIG_MFD_WM831X_I2C is not set
 # CONFIG_MFD_WM831X_SPI is not set
@@ -1126,6 +1143,8 @@ CONFIG_MMC_BLOCK_MINORS=8
 CONFIG_MMC_OMAP=y
 CONFIG_MMC_OMAP_HS=y
 # CONFIG_MMC_SDHCI is not set
+# CONFIG_MMC_SDHCI_PXAV2 is not set
+# CONFIG_MMC_SDHCI_PXAV3 is not set
 # CONFIG_MMC_TEST is not set
 # CONFIG_MMC_USHC is not set
 # CONFIG_MMC_VUB300 is not set
@@ -1272,7 +1291,7 @@ CONFIG_NET_KEY_MIGRATE=y
 # CONFIG_NET_SCHED is not set
 # CONFIG_NET_TCPPROBE is not set
 CONFIG_NEW_LEDS=y
-# CONFIG_NFC_DEVICES is not set
+# CONFIG_NFC is not set
 # CONFIG_NFSD is not set
 CONFIG_NFS_ACL_SUPPORT=y
 CONFIG_NFS_COMMON=y
@@ -1357,7 +1376,6 @@ CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK=0
 # CONFIG_OMAP2_DSS_RFBI is not set
 # CONFIG_OMAP2_DSS_SDI is not set
 CONFIG_OMAP2_DSS_SLEEP_AFTER_VENC_RESET=y
-CONFIG_OMAP2_DSS_SLEEP_BEFORE_RESET=y
 CONFIG_OMAP2_DSS_VENC=y
 CONFIG_OMAP2_VRAM=y
 CONFIG_OMAP2_VRAM_SIZE=32
@@ -1379,7 +1397,6 @@ CONFIG_OMAP_PACKAGE_CBL=y
 CONFIG_OMAP_PACKAGE_CBP=y
 CONFIG_OMAP_PACKAGE_CBS=y
 CONFIG_OMAP_PACKAGE_CUS=y
-# CONFIG_OMAP_PM_NONE is not set
 CONFIG_OMAP_PM_NOOP=y
 CONFIG_OMAP_RESET_CLOCKS=y
 # CONFIG_OMAP_SMARTREFLEX is not set
@@ -1407,7 +1424,7 @@ CONFIG_PANEL_TAAL=y
 # CONFIG_PANTHERLORD_FF is not set
 # CONFIG_PARPORT is not set
 CONFIG_PARTITION_ADVANCED=y
-# CONFIG_PATA_ARASAN_CF is not set
+# CONFIG_PATA_IMX is not set
 # CONFIG_PATA_PLATFORM is not set
 # CONFIG_PCCARD is not set
 # CONFIG_PCI_SYSCALL is not set
@@ -1429,10 +1446,10 @@ CONFIG_PM=y
 # CONFIG_PMIC_ADP5520 is not set
 # CONFIG_PMIC_DA903X is not set
 CONFIG_PM_ADVANCED_DEBUG=y
+CONFIG_PM_CLK=y
 CONFIG_PM_DEBUG=y
 CONFIG_PM_OPP=y
 CONFIG_PM_RUNTIME=y
-CONFIG_PM_RUNTIME_CLK=y
 CONFIG_PM_SLEEP=y
 CONFIG_PM_SLEEP_SMP=y
 # CONFIG_PM_TEST_SUSPEND is not set
@@ -1443,6 +1460,7 @@ CONFIG_POWER_SUPPLY=y
 # CONFIG_PPP is not set
 # CONFIG_PPS is not set
 CONFIG_PREEMPT=y
+CONFIG_PREEMPT_COUNT=y
 # CONFIG_PREEMPT_NONE is not set
 CONFIG_PREEMPT_RCU=y
 # CONFIG_PREEMPT_TRACER is not set
@@ -1485,6 +1503,8 @@ CONFIG_RD_LZMA=y
 CONFIG_RD_LZO=y
 CONFIG_RD_XZ=y
 # CONFIG_REALTEK_PHY is not set
+CONFIG_REGMAP=y
+CONFIG_REGMAP_I2C=y
 CONFIG_REGULATOR=y
 # CONFIG_REGULATOR_AD5398 is not set
 # CONFIG_REGULATOR_BQ24022 is not set
@@ -1591,6 +1611,7 @@ CONFIG_RTL8187=m
 CONFIG_RTL8187_LEDS=y
 CONFIG_RTL8192CU=m
 CONFIG_RTL8192C_COMMON=m
+# CONFIG_RTL8192DE is not set
 CONFIG_RTL8192SE=m
 CONFIG_RTLWIFI=m
 CONFIG_RT_MUTEXES=y
@@ -1603,8 +1624,6 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
 CONFIG_SCHEDSTATS=y
 # CONFIG_SCHED_AUTOGROUP is not set
 CONFIG_SCHED_DEBUG=y
-# CONFIG_SCHED_MC is not set
-# CONFIG_SCHED_SMT is not set
 # CONFIG_SCHED_TRACER is not set
 CONFIG_SCSI=y
 # CONFIG_SCSI_CONSTANTS is not set
@@ -1699,6 +1718,7 @@ CONFIG_SELECT_MEMORY_MODEL=y
 # CONFIG_SENSORS_LM92 is not set
 # CONFIG_SENSORS_LM93 is not set
 # CONFIG_SENSORS_LM95241 is not set
+# CONFIG_SENSORS_LM95245 is not set
 # CONFIG_SENSORS_LTC4151 is not set
 # CONFIG_SENSORS_LTC4215 is not set
 # CONFIG_SENSORS_LTC4245 is not set
@@ -1706,13 +1726,17 @@ CONFIG_SELECT_MEMORY_MODEL=y
 # CONFIG_SENSORS_MAX1111 is not set
 # CONFIG_SENSORS_MAX16065 is not set
 # CONFIG_SENSORS_MAX1619 is not set
+# CONFIG_SENSORS_MAX1668 is not set
 # CONFIG_SENSORS_MAX6639 is not set
 # CONFIG_SENSORS_MAX6642 is not set
 # CONFIG_SENSORS_MAX6650 is not set
+# CONFIG_SENSORS_NTC_THERMISTOR is not set
 # CONFIG_SENSORS_PC87360 is not set
 # CONFIG_SENSORS_PC87427 is not set
 # CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_SENSORS_SCH5627 is not set
+# CONFIG_SENSORS_SCH5636 is not set
+# CONFIG_SENSORS_SCH56XX_COMMON is not set
 # CONFIG_SENSORS_SHT15 is not set
 # CONFIG_SENSORS_SHT21 is not set
 # CONFIG_SENSORS_SMM665 is not set
@@ -1810,6 +1834,7 @@ CONFIG_SND_OMAP_SOC_MCPDM=m
 CONFIG_SND_OMAP_SOC_OMAP3EVM=m
 CONFIG_SND_OMAP_SOC_OMAP3_BEAGLE=m
 CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=m
+# CONFIG_SND_OMAP_SOC_OMAP4_HDMI is not set
 CONFIG_SND_OMAP_SOC_OVERO=m
 # CONFIG_SND_OMAP_SOC_RX51 is not set
 CONFIG_SND_OMAP_SOC_SDP3430=m
@@ -1863,8 +1888,6 @@ CONFIG_SPI_BITBANG=m
 # CONFIG_SPI_DESIGNWARE is not set
 # CONFIG_SPI_GPIO is not set
 CONFIG_SPI_IMX=m
-CONFIG_SPI_IMX_VER_0_7=y
-CONFIG_SPI_IMX_VER_2_3=y
 CONFIG_SPI_MASTER=y
 # CONFIG_SPI_OC_TINY is not set
 CONFIG_SPI_OMAP24XX=y
@@ -2024,6 +2047,7 @@ CONFIG_USB_BELKIN=y
 CONFIG_USB_DEBUG=y
 # CONFIG_USB_DEVICEFS is not set
 CONFIG_USB_DEVICE_CLASS=y
+# CONFIG_USB_DUMMY_HCD is not set
 # CONFIG_USB_DYNAMIC_MINORS is not set
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_HCD_OMAP=y
@@ -2036,19 +2060,12 @@ CONFIG_USB_EPSON2888=y
 # CONFIG_USB_FILE_STORAGE is not set
 # CONFIG_USB_FTDI_ELAN is not set
 # CONFIG_USB_FUNCTIONFS is not set
-CONFIG_USB_FUSB300=y
+CONFIG_USB_FUSB300=m
 # CONFIG_USB_GADGETFS is not set
 CONFIG_USB_GADGET_DEBUG=y
 CONFIG_USB_GADGET_DEBUG_FILES=y
 CONFIG_USB_GADGET_DEBUG_FS=y
 CONFIG_USB_GADGET_DUALSPEED=y
-# CONFIG_USB_GADGET_DUMMY_HCD is not set
-CONFIG_USB_GADGET_FUSB300=y
-# CONFIG_USB_GADGET_M66592 is not set
-# CONFIG_USB_GADGET_OMAP is not set
-# CONFIG_USB_GADGET_PXA_U2O is not set
-# CONFIG_USB_GADGET_R8A66597 is not set
-CONFIG_USB_GADGET_SELECTED=y
 CONFIG_USB_GADGET_VBUS_DRAW=2
 # CONFIG_USB_GPIO_VBUS is not set
 # CONFIG_USB_G_DBGP is not set
@@ -2073,12 +2090,14 @@ CONFIG_USB_KC2190=y
 # CONFIG_USB_LED is not set
 # CONFIG_USB_LEGOTOWER is not set
 CONFIG_USB_LIBUSUAL=y
+# CONFIG_USB_M66592 is not set
 CONFIG_USB_MASS_STORAGE=m
 # CONFIG_USB_MDC800 is not set
 # CONFIG_USB_MICROTEK is not set
 # CONFIG_USB_MIDI_GADGET is not set
 CONFIG_USB_MON=y
 # CONFIG_USB_MUSB_HDRC is not set
+# CONFIG_USB_NET2272 is not set
 CONFIG_USB_NET_AX8817X=y
 CONFIG_USB_NET_CDCETHER=y
 # CONFIG_USB_NET_CDC_EEM is not set
@@ -2102,12 +2121,14 @@ CONFIG_USB_NET_ZAURUS=y
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_HCD_OMAP3=y
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+# CONFIG_USB_OMAP is not set
 # CONFIG_USB_OTG_BLACKLIST_HUB is not set
 CONFIG_USB_OTG_UTILS=y
 # CONFIG_USB_OTG_WHITELIST is not set
 # CONFIG_USB_OXU210HP_HCD is not set
 # CONFIG_USB_PEGASUS is not set
 # CONFIG_USB_PRINTER is not set
+# CONFIG_USB_R8A66597 is not set
 # CONFIG_USB_R8A66597_HCD is not set
 # CONFIG_USB_RIO500 is not set
 # CONFIG_USB_RTL8150 is not set
@@ -2159,6 +2180,8 @@ CONFIG_VFP=y
 CONFIG_VFPv3=y
 # CONFIG_VGASTATE is not set
 # CONFIG_VIDEO_OUTPUT_CONTROL is not set
+# CONFIG_VIRTIO_BALLOON is not set
+# CONFIG_VIRT_DRIVERS is not set
 CONFIG_VIRT_TO_BUS=y
 # CONFIG_VITESSE_PHY is not set
 # CONFIG_VLAN_8021Q is not set
@@ -2188,6 +2211,7 @@ CONFIG_W1_MASTER_MXC=y
 # CONFIG_WAN is not set
 # CONFIG_WAN_ROUTER is not set
 CONFIG_WATCHDOG=y
+# CONFIG_WATCHDOG_CORE is not set
 # CONFIG_WATCHDOG_NOWAYOUT is not set
 CONFIG_WEXT_CORE=y
 CONFIG_WEXT_PRIV=y