aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Rigby <john.rigby@linaro.org>2011-09-27 13:29:36 -0600
committerJohn Rigby <john.rigby@linaro.org>2011-09-27 13:29:36 -0600
commit5f019ec8189474012d1345fe9f9a2f2b337592a6 (patch)
treef8568c8f08e016e9a716b69796fe3b8f1a9ea7e4
parent5f484cb77af5cb9957385b0885de1225019ef485 (diff)
downloadlinux-linaro-5f019ec8189474012d1345fe9f9a2f2b337592a6.tar.gz
LINARO: Cleanup configs after removing other flavours
Signed-off-by: John Rigby <john.rigby@linaro.org>
-rw-r--r--debian.linaro/config/armel/config.common.armel4
-rw-r--r--debian.linaro/config/armel/config.flavour.linaro-mx5137
-rw-r--r--debian.linaro/config/armel/config.flavour.linaro-omap42
-rw-r--r--debian.linaro/config/armel/config.flavour.linaro-vexpress41
-rw-r--r--debian.linaro/config/config.common.ubuntu268
5 files changed, 41 insertions, 351 deletions
diff --git a/debian.linaro/config/armel/config.common.armel b/debian.linaro/config/armel/config.common.armel
index 1903a346e48..02fe48057c1 100644
--- a/debian.linaro/config/armel/config.common.armel
+++ b/debian.linaro/config/armel/config.common.armel
@@ -1,3 +1,7 @@
#
# Config options for config.common.armel automatically generated by splitconfig.pl
#
+#
+# Single flavour kernel packages have no arch dependent config options
+# look in ../config.common.ubuntu for full config
+#
diff --git a/debian.linaro/config/armel/config.flavour.linaro-mx51 b/debian.linaro/config/armel/config.flavour.linaro-mx51
index 63e76ee11e4..7d3d43b7442 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-mx51
+++ b/debian.linaro/config/armel/config.flavour.linaro-mx51
@@ -1,36 +1,7 @@
#
# Config options for config.flavour.linaro-mx51 automatically generated by splitconfig.pl
#
-CONFIG_ARCH_MXC=y
-# CONFIG_ARCH_OMAP is not set
-# CONFIG_ARCH_VEXPRESS is not set
-CONFIG_ARM_L1_CACHE_SHIFT=6
-CONFIG_ARM_THUMBEE=y
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-CONFIG_CMDLINE=""
-# CONFIG_DISPLAY_SUPPORT is not set
-# CONFIG_DRM is not set
-# CONFIG_FB_MODE_HELPERS is not set
-# CONFIG_FB_TILEBLITTING is not set
-# CONFIG_FIRMWARE_EDID is not set
-# CONFIG_FONTS is not set
-# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
-# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
-CONFIG_GPIOLIB=y
-CONFIG_HZ=100
-CONFIG_MAC80211_RC_DEFAULT="pid"
-# CONFIG_MAC80211_RC_DEFAULT_MINSTREL is not set
-CONFIG_MAC80211_RC_DEFAULT_PID=y
-# CONFIG_MFD_CORE is not set
-# CONFIG_MMC_UNSAFE_RESUME is not set
-# CONFIG_MTD_ARM_INTEGRATOR is not set
-CONFIG_NOP_USB_XCEIV=y
-# CONFIG_SND_DYNAMIC_MINORS is not set
-# CONFIG_TWL4030_CORE is not set
-CONFIG_USB_ARCH_HAS_EHCI=y
-# CONFIG_USB_ARCH_HAS_OHCI is not set
-CONFIG_USB_EHCI_ROOT_HUB_TT=y
-# CONFIG_USB_GADGET is not set
-# CONFIG_USB_ISP1760_HCD is not set
-# CONFIG_USB_OTG is not set
-CONFIG_W1=y
+#
+# Single flavour kernel packages have no flavour dependent config options
+# look in ../config.common.ubuntu for full config
+#
diff --git a/debian.linaro/config/armel/config.flavour.linaro-omap b/debian.linaro/config/armel/config.flavour.linaro-omap
deleted file mode 100644
index 4f0cec37004..00000000000
--- a/debian.linaro/config/armel/config.flavour.linaro-omap
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# Config options for config.flavour.linaro-omap automatically generated by splitconfig.pl
-#
-# CONFIG_ARCH_MXC is not set
-CONFIG_ARCH_OMAP=y
-# CONFIG_ARCH_VEXPRESS is not set
-# CONFIG_ARM_ERRATA_751472 is not set
-# CONFIG_ARM_ERRATA_753970 is not set
-CONFIG_ARM_L1_CACHE_SHIFT=5
-CONFIG_ARM_THUMBEE=y
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_CMDLINE="root=/dev/mmcblk0p2 rootwait console=ttyO2,115200"
-CONFIG_DISPLAY_SUPPORT=y
-CONFIG_DRM=y
-CONFIG_FB_MODE_HELPERS=y
-CONFIG_FB_TILEBLITTING=y
-CONFIG_FIRMWARE_EDID=y
-CONFIG_FONTS=y
-CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
-CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-CONFIG_GPIOLIB=y
-CONFIG_HZ=128
-CONFIG_MAC80211_RC_DEFAULT="pid"
-# CONFIG_MAC80211_RC_DEFAULT_MINSTREL is not set
-CONFIG_MAC80211_RC_DEFAULT_PID=y
-CONFIG_MFD_CORE=y
-CONFIG_MMC_UNSAFE_RESUME=y
-# CONFIG_MTD_ARM_INTEGRATOR is not set
-CONFIG_NOP_USB_XCEIV=y
-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_USB_ARCH_HAS_EHCI=y
-CONFIG_USB_ARCH_HAS_OHCI=y
-# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
-CONFIG_USB_GADGET=y
-# CONFIG_USB_ISP1760_HCD is not set
-CONFIG_USB_OTG=y
-CONFIG_W1=y
diff --git a/debian.linaro/config/armel/config.flavour.linaro-vexpress b/debian.linaro/config/armel/config.flavour.linaro-vexpress
deleted file mode 100644
index 2030e40f582..00000000000
--- a/debian.linaro/config/armel/config.flavour.linaro-vexpress
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# Config options for config.flavour.linaro-vexpress automatically generated by splitconfig.pl
-#
-# CONFIG_ARCH_MXC is not set
-# CONFIG_ARCH_OMAP is not set
-CONFIG_ARCH_VEXPRESS=y
-CONFIG_ARM_ERRATA_751472=y
-CONFIG_ARM_ERRATA_753970=y
-CONFIG_ARM_L1_CACHE_SHIFT=5
-# CONFIG_ARM_THUMBEE is not set
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-CONFIG_CMDLINE="root=/dev/nfs nfsroot=10.1.69.3:/work/nfsroot ip=dhcp console=ttyAMA0 mem=128M"
-# CONFIG_DISPLAY_SUPPORT is not set
-# CONFIG_DRM is not set
-# CONFIG_FB_MODE_HELPERS is not set
-# CONFIG_FB_TILEBLITTING is not set
-# CONFIG_FIRMWARE_EDID is not set
-# CONFIG_FONTS is not set
-# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
-# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
-# CONFIG_GPIOLIB is not set
-CONFIG_HZ=100
-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_MMC_UNSAFE_RESUME is not set
-CONFIG_MTD_ARM_INTEGRATOR=y
-# CONFIG_NOP_USB_XCEIV is not set
-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_USB_ARCH_HAS_EHCI is not set
-# CONFIG_USB_ARCH_HAS_OHCI is not set
-CONFIG_USB_GADGET=y
-CONFIG_USB_ISP1760_HCD=y
-CONFIG_USB_OTG=y
-# CONFIG_W1 is not set
diff --git a/debian.linaro/config/config.common.ubuntu b/debian.linaro/config/config.common.ubuntu
index 9cfcd09aabb..0397fab47be 100644
--- a/debian.linaro/config/config.common.ubuntu
+++ b/debian.linaro/config/config.common.ubuntu
@@ -29,8 +29,6 @@ CONFIG_ANON_INODES=y
# CONFIG_ARCH_H720X is not set
CONFIG_ARCH_HAS_CPUFREQ=y
CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
-CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y
-CONFIG_ARCH_HAS_OPP=y
# CONFIG_ARCH_INTEGRATOR is not set
# CONFIG_ARCH_IOP13XX is not set
# CONFIG_ARCH_IOP32X is not set
@@ -52,19 +50,14 @@ CONFIG_ARCH_HAS_OPP=y
CONFIG_ARCH_MX5=y
# CONFIG_ARCH_MX503 is not set
CONFIG_ARCH_MX51=y
+CONFIG_ARCH_MXC=y
CONFIG_ARCH_MXC_AUDMUX_V2=y
CONFIG_ARCH_MXC_IOMUX_V3=y
# CONFIG_ARCH_MXS is not set
# CONFIG_ARCH_NETX is not set
# CONFIG_ARCH_NOMADIK is not set
# CONFIG_ARCH_NUC93X is not set
-# CONFIG_ARCH_OMAP1 is not set
-# CONFIG_ARCH_OMAP2 is not set
-CONFIG_ARCH_OMAP2PLUS=y
-CONFIG_ARCH_OMAP2PLUS_TYPICAL=y
-CONFIG_ARCH_OMAP3=y
-CONFIG_ARCH_OMAP4=y
-CONFIG_ARCH_OMAP_OTG=y
+# CONFIG_ARCH_OMAP is not set
# CONFIG_ARCH_ORION5X is not set
# CONFIG_ARCH_PNX4008 is not set
# CONFIG_ARCH_PXA is not set
@@ -89,31 +82,25 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y
# CONFIG_ARCH_U8500 is not set
# CONFIG_ARCH_USES_GETTIMEOFFSET is not set
# CONFIG_ARCH_VERSATILE is not set
-CONFIG_ARCH_VEXPRESS_CA9X4=y
+# CONFIG_ARCH_VEXPRESS is not set
# CONFIG_ARCH_VT8500 is not set
# CONFIG_ARCH_W90X900 is not set
-CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
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
# CONFIG_ARM_ERRATA_460075 is not set
-CONFIG_ARM_ERRATA_720789=y
-# CONFIG_ARM_ERRATA_742230 is not set
-# CONFIG_ARM_ERRATA_742231 is not set
# CONFIG_ARM_ERRATA_743622 is not set
# CONFIG_ARM_ERRATA_754322 is not set
-# CONFIG_ARM_ERRATA_754327 is not set
-CONFIG_ARM_GIC=y
+CONFIG_ARM_L1_CACHE_SHIFT=6
CONFIG_ARM_L1_CACHE_SHIFT_6=y
# CONFIG_ARM_PATCH_PHYS_VIRT is not set
# CONFIG_ARM_SP805_WATCHDOG is not set
CONFIG_ARM_THUMB=y
-CONFIG_ARM_TIMER_SP804=y
+CONFIG_ARM_THUMBEE=y
CONFIG_ARM_UNWIND=y
# CONFIG_ARPD is not set
CONFIG_AT76C50X_USB=m
@@ -158,10 +145,7 @@ CONFIG_B43_PHY_N=y
CONFIG_B43_PIO=y
# CONFIG_B43_SDIO is not set
# CONFIG_B44 is not set
-# CONFIG_BACKLIGHT_ADP8860 is not set
-# CONFIG_BACKLIGHT_ADP8870 is not set
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_GENERIC=y
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
# CONFIG_BACKTRACE_SELF_TEST is not set
CONFIG_BASE_FULL=y
CONFIG_BASE_SMALL=0
@@ -233,8 +217,6 @@ CONFIG_BT_HCIUART_LL=y
# CONFIG_BT_MRVL is not set
# CONFIG_BT_SCO is not set
CONFIG_BUG=y
-CONFIG_CACHE_L2X0=y
-CONFIG_CACHE_PL310=y
# CONFIG_CAIF is not set
# CONFIG_CAN is not set
CONFIG_CAN_PM_TRACE=y
@@ -263,7 +245,6 @@ CONFIG_CGROUPS=y
# CONFIG_CHARGER_GPIO is not set
# CONFIG_CHARGER_ISP1704 is not set
# CONFIG_CHARGER_MAX8903 is not set
-# CONFIG_CHARGER_TWL4030 is not set
# CONFIG_CHR_DEV_OSST is not set
# CONFIG_CHR_DEV_SCH is not set
# CONFIG_CHR_DEV_SG is not set
@@ -273,9 +254,7 @@ CONFIG_CGROUPS=y
# CONFIG_CLEANCACHE is not set
CONFIG_CLKDEV_LOOKUP=y
CONFIG_CLKSRC_MMIO=y
-# CONFIG_CMDLINE_EXTEND is not set
-# CONFIG_CMDLINE_FORCE is not set
-CONFIG_CMDLINE_FROM_BOOTLOADER=y
+CONFIG_CMDLINE=""
# CONFIG_CODA_FS is not set
# CONFIG_COMPACTION is not set
# CONFIG_COMPAT_BRK is not set
@@ -300,9 +279,7 @@ CONFIG_CPU_HAS_ASID=y
CONFIG_CPU_HAS_PMU=y
# CONFIG_CPU_ICACHE_DISABLE is not set
# CONFIG_CPU_IDLE is not set
-# CONFIG_CPU_NOTIFIER_ERROR_INJECT is not set
CONFIG_CPU_PABRT_V7=y
-CONFIG_CPU_RMAP=y
CONFIG_CPU_TLB_V7=y
CONFIG_CPU_V7=y
CONFIG_CRAMFS=y
@@ -337,8 +314,6 @@ CONFIG_CRYPTO_CRC32C=y
# CONFIG_CRYPTO_CTS is not set
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=m
# CONFIG_CRYPTO_FCRYPT is not set
# CONFIG_CRYPTO_GCM is not set
@@ -360,7 +335,6 @@ CONFIG_CRYPTO_MICHAEL_MIC=y
# CONFIG_CRYPTO_NULL is not set
# CONFIG_CRYPTO_PCBC is not set
CONFIG_CRYPTO_PCOMP2=y
-# CONFIG_CRYPTO_PCRYPT is not set
# CONFIG_CRYPTO_RMD128 is not set
# CONFIG_CRYPTO_RMD160 is not set
# CONFIG_CRYPTO_RMD256 is not set
@@ -414,7 +388,6 @@ CONFIG_DEBUG_MUTEXES=y
# CONFIG_DEBUG_OBJECTS is not set
# CONFIG_DEBUG_PAGEALLOC is not set
# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
-# CONFIG_DEBUG_PER_CPU_MAPS is not set
CONFIG_DEBUG_PREEMPT=y
# CONFIG_DEBUG_RT_MUTEXES is not set
# CONFIG_DEBUG_SECTION_MISMATCH is not set
@@ -455,6 +428,7 @@ CONFIG_DETECT_HUNG_TASK=y
# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
CONFIG_DEVTMPFS=y
CONFIG_DEVTMPFS_MOUNT=y
+# CONFIG_DISPLAY_SUPPORT is not set
# CONFIG_DM9000 is not set
# CONFIG_DMADEVICES is not set
# CONFIG_DMA_API_DEBUG is not set
@@ -472,6 +446,7 @@ CONFIG_DEVTMPFS_MOUNT=y
CONFIG_DNOTIFY=y
CONFIG_DNS_RESOLVER=y
# CONFIG_DRAGONRISE_FF is not set
+# CONFIG_DRM is not set
CONFIG_DTC=y
# CONFIG_DUMMY is not set
CONFIG_DUMMY_CONSOLE=y
@@ -529,18 +504,14 @@ CONFIG_FB_CFB_IMAGEBLIT=y
# CONFIG_FB_FOREIGN_ENDIAN is not set
# CONFIG_FB_MACMODES is not set
# CONFIG_FB_METRONOME is not set
-CONFIG_FB_OMAP2=y
-CONFIG_FB_OMAP2_DEBUG_SUPPORT=y
-CONFIG_FB_OMAP2_NUM_FBS=3
-# CONFIG_FB_OMAP_BOOTLOADER_INIT is not set
-# CONFIG_FB_OMAP_LCD_VGA is not set
+# CONFIG_FB_MODE_HELPERS is not set
# CONFIG_FB_S1D13XXX is not set
# CONFIG_FB_SVGALIB is not set
# CONFIG_FB_SYS_COPYAREA is not set
# CONFIG_FB_SYS_FILLRECT is not set
# CONFIG_FB_SYS_FOPS is not set
# CONFIG_FB_SYS_IMAGEBLIT is not set
-# CONFIG_FB_TMIO is not set
+# CONFIG_FB_TILEBLITTING is not set
# CONFIG_FB_UDL is not set
# CONFIG_FB_UVESA is not set
# CONFIG_FB_VIRTUAL is not set
@@ -548,23 +519,19 @@ CONFIG_FB_OMAP2_NUM_FBS=3
CONFIG_FEC=y
# CONFIG_FHANDLE is not set
CONFIG_FILE_LOCKING=y
+# CONFIG_FIRMWARE_EDID is not set
CONFIG_FIRMWARE_IN_KERNEL=y
# CONFIG_FIXED_PHY is not set
CONFIG_FLATMEM=y
CONFIG_FLATMEM_MANUAL=y
CONFIG_FLAT_NODE_MEM_MAP=y
-# CONFIG_FONT_10x18 is not set
-# CONFIG_FONT_6x11 is not set
-# CONFIG_FONT_7x14 is not set
+# CONFIG_FONTS is not set
CONFIG_FONT_8x16=y
CONFIG_FONT_8x8=y
-# CONFIG_FONT_ACORN_8x8 is not set
-# CONFIG_FONT_MINI_4x6 is not set
-# CONFIG_FONT_PEARL_8x8 is not set
-# CONFIG_FONT_SUN12x22 is not set
-# CONFIG_FONT_SUN8x16 is not set
CONFIG_FORCE_MAX_ZONEORDER=11
CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
CONFIG_FRAME_WARN=1024
CONFIG_FREEZER=y
# CONFIG_FSCACHE is not set
@@ -586,17 +553,15 @@ CONFIG_FW_LOADER=y
CONFIG_GENERIC_ACL=y
CONFIG_GENERIC_CALIBRATE_DELAY=y
CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
CONFIG_GENERIC_GPIO=y
CONFIG_GENERIC_HARDIRQS=y
CONFIG_GENERIC_HWEIGHT=y
-CONFIG_GENERIC_IRQ_CHIP=y
CONFIG_GENERIC_IRQ_PROBE=y
CONFIG_GENERIC_IRQ_SHOW=y
-CONFIG_GENERIC_LOCKBREAK=y
CONFIG_GENERIC_TRACER=y
# CONFIG_GFS2_FS is not set
+CONFIG_GPIOLIB=y
# CONFIG_GPIO_74X164 is not set
# CONFIG_GPIO_ADP5588 is not set
# CONFIG_GPIO_BASIC_MMIO is not set
@@ -611,7 +576,6 @@ CONFIG_GENERIC_TRACER=y
# CONFIG_GPIO_PL061 is not set
# CONFIG_GPIO_SX150X is not set
CONFIG_GPIO_SYSFS=y
-CONFIG_GPIO_TWL4030=y
# CONFIG_GREENASIA_FF is not set
# CONFIG_HAMRADIO is not set
CONFIG_HARDIRQS_SW_RESEND=y
@@ -622,8 +586,6 @@ CONFIG_HAS_IOPORT=y
CONFIG_HAVE_AOUT=y
CONFIG_HAVE_ARCH_KGDB=y
CONFIG_HAVE_ARCH_PFN_VALID=y
-CONFIG_HAVE_ARM_SCU=y
-CONFIG_HAVE_ARM_TWD=y
CONFIG_HAVE_CLK=y
CONFIG_HAVE_C_RECORDMCOUNT=y
CONFIG_HAVE_DMA_API_DEBUG=y
@@ -643,13 +605,11 @@ CONFIG_HAVE_KRETPROBES=y
CONFIG_HAVE_LATENCYTOP_SUPPORT=y
CONFIG_HAVE_MEMBLOCK=y
CONFIG_HAVE_OPROFILE=y
-CONFIG_HAVE_PATA_PLATFORM=y
CONFIG_HAVE_PERF_EVENTS=y
CONFIG_HAVE_PROC_CPU=y
CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
CONFIG_HAVE_SCHED_CLOCK=y
CONFIG_HAVE_SPARSE_IRQ=y
-# CONFIG_HDQ_MASTER_OMAP is not set
# CONFIG_HEADERS_CHECK is not set
# CONFIG_HFSPLUS_FS is not set
# CONFIG_HFS_FS is not set
@@ -706,7 +666,6 @@ CONFIG_HIGHMEM=y
CONFIG_HIGH_RES_TIMERS=y
# CONFIG_HOSTAP is not set
CONFIG_HOTPLUG=y
-CONFIG_HOTPLUG_CPU=y
# CONFIG_HPFS_FS is not set
# CONFIG_HTC_EGPIO is not set
# CONFIG_HTC_I2CPLD is not set
@@ -716,13 +675,12 @@ CONFIG_HOTPLUG_CPU=y
CONFIG_HWMON=m
# CONFIG_HWMON_DEBUG_CHIP is not set
# CONFIG_HWMON_VID is not set
-# CONFIG_HWSPINLOCK is not set
CONFIG_HW_CONSOLE=y
CONFIG_HW_PERF_EVENTS=y
CONFIG_HW_RANDOM=m
# CONFIG_HW_RANDOM_TIMERIOMEM is not set
+CONFIG_HZ=100
CONFIG_I2C=y
-CONFIG_I2C_ALGOBIT=y
CONFIG_I2C_BOARDINFO=y
CONFIG_I2C_CHARDEV=y
CONFIG_I2C_COMPAT=y
@@ -736,7 +694,6 @@ CONFIG_I2C_HELPER_AUTO=y
# CONFIG_I2C_IMX is not set
# CONFIG_I2C_MUX is not set
# CONFIG_I2C_OCORES is not set
-CONFIG_I2C_OMAP=y
# CONFIG_I2C_PARPORT_LIGHT is not set
# CONFIG_I2C_PCA_PLATFORM is not set
# CONFIG_I2C_PXA_PCI is not set
@@ -744,7 +701,6 @@ CONFIG_I2C_OMAP=y
# CONFIG_I2C_STUB is not set
# CONFIG_I2C_TAOS_EVM is not set
# CONFIG_I2C_TINY_USB is not set
-CONFIG_I2C_VERSATILE=y
# CONFIG_I2C_XILINX is not set
# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
@@ -754,7 +710,6 @@ CONFIG_I2C_VERSATILE=y
# CONFIG_IBM_NEW_EMAC_TAH is not set
# CONFIG_IBM_NEW_EMAC_ZMII is not set
# CONFIG_ICPLUS_PHY is not set
-CONFIG_ICST=y
# CONFIG_IDE is not set
# CONFIG_IEEE802154 is not set
CONFIG_IKCONFIG=y
@@ -850,8 +805,6 @@ 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=y
-# CONFIG_INPUT_TWL4030_VIBRA is not set
CONFIG_INPUT_UINPUT=y
# CONFIG_INPUT_YEALINK is not set
CONFIG_IOSCHED_CFQ=y
@@ -893,7 +846,6 @@ CONFIG_IRQ_WORK=y
# CONFIG_ISCSI_TCP is not set
# CONFIG_ISDN is not set
CONFIG_ISO9660_FS=m
-# CONFIG_ISP1301_OMAP is not set
# CONFIG_IWM is not set
CONFIG_JBD=y
CONFIG_JBD2=y
@@ -938,14 +890,12 @@ CONFIG_KEYBOARD_GPIO=y
# CONFIG_KEYBOARD_MCS is not set
# CONFIG_KEYBOARD_MPR121 is not set
# CONFIG_KEYBOARD_NEWTON is not set
-# CONFIG_KEYBOARD_OMAP4 is not set
# CONFIG_KEYBOARD_OPENCORES is not set
# CONFIG_KEYBOARD_QT1070 is not set
# CONFIG_KEYBOARD_QT2160 is not set
# CONFIG_KEYBOARD_STOWAWAY is not set
# CONFIG_KEYBOARD_SUNKBD is not set
# CONFIG_KEYBOARD_TCA6416 is not set
-CONFIG_KEYBOARD_TWL4030=y
# CONFIG_KEYBOARD_XTKBD is not set
CONFIG_KEYS=y
# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
@@ -962,17 +912,7 @@ CONFIG_KTIME_SCALAR=y
# CONFIG_LAPB is not set
# CONFIG_LATENCYTOP is not set
CONFIG_LBDAF=y
-CONFIG_LCD_CLASS_DEVICE=y
-# 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=y
-# CONFIG_LCD_S6E63M0 is not set
-# CONFIG_LCD_TDO24M is not set
-# CONFIG_LCD_VGG2432A4 is not set
# CONFIG_LDM_PARTITION is not set
-CONFIG_LEDS=y
# CONFIG_LEDS_BD2802 is not set
CONFIG_LEDS_CLASS=y
# CONFIG_LEDS_DAC124S085 is not set
@@ -1012,7 +952,6 @@ CONFIG_LIBERTAS_USB=m
# CONFIG_LLC2 is not set
CONFIG_LOCALVERSION=""
# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_LOCAL_TIMERS=y
CONFIG_LOCKD=y
CONFIG_LOCKDEP=y
CONFIG_LOCKDEP_SUPPORT=y
@@ -1041,40 +980,18 @@ CONFIG_MAC80211_HAS_RC=y
CONFIG_MAC80211_HWSIM=m
CONFIG_MAC80211_LEDS=y
# CONFIG_MAC80211_MESH is not set
+CONFIG_MAC80211_RC_DEFAULT="pid"
+# CONFIG_MAC80211_RC_DEFAULT_MINSTREL is not set
+CONFIG_MAC80211_RC_DEFAULT_PID=y
CONFIG_MAC80211_RC_MINSTREL=y
CONFIG_MAC80211_RC_MINSTREL_HT=y
CONFIG_MAC80211_RC_PID=y
-CONFIG_MACH_CM_T35=y
-CONFIG_MACH_CM_T3517=y
-# CONFIG_MACH_CRANEBOARD is not set
-CONFIG_MACH_DEVKIT8000=y
# CONFIG_MACH_EUKREA_CPUIMX51 is not set
# CONFIG_MACH_EUKREA_CPUIMX51SD is not set
-CONFIG_MACH_IGEP0020=y
-CONFIG_MACH_IGEP0030=y
CONFIG_MACH_MX51_3DS=y
CONFIG_MACH_MX51_BABBAGE=y
CONFIG_MACH_MX51_EFIKAMX=y
CONFIG_MACH_MX51_EFIKASB=y
-CONFIG_MACH_NOKIA_RM680=y
-CONFIG_MACH_NOKIA_RX51=y
-CONFIG_MACH_OMAP3517EVM=y
-CONFIG_MACH_OMAP3530_LV_SOM=y
-CONFIG_MACH_OMAP3EVM=y
-CONFIG_MACH_OMAP3_BEAGLE=y
-CONFIG_MACH_OMAP3_PANDORA=y
-CONFIG_MACH_OMAP3_TORPEDO=y
-CONFIG_MACH_OMAP3_TOUCHBOOK=y
-CONFIG_MACH_OMAP4_PANDA=y
-CONFIG_MACH_OMAP_3430SDP=y
-CONFIG_MACH_OMAP_3630SDP=y
-CONFIG_MACH_OMAP_4430SDP=y
-CONFIG_MACH_OMAP_LDP=y
-CONFIG_MACH_OMAP_ZOOM2=y
-CONFIG_MACH_OMAP_ZOOM3=y
-CONFIG_MACH_OVERO=y
-CONFIG_MACH_SBC3530=y
-CONFIG_MACH_TI8168EVM=y
# CONFIG_MACVLAN is not set
# CONFIG_MAC_PARTITION is not set
CONFIG_MAGIC_SYSRQ=y
@@ -1086,11 +1003,11 @@ CONFIG_MD=y
# CONFIG_MEMSTICK is not set
# CONFIG_MFD_88PM860X is not set
# CONFIG_MFD_ASIC3 is not set
+# CONFIG_MFD_CORE is not set
# CONFIG_MFD_MAX8925 is not set
# CONFIG_MFD_MAX8997 is not set
# CONFIG_MFD_MAX8998 is not set
# CONFIG_MFD_MC13XXX is not set
-CONFIG_MFD_OMAP_USB_HOST=y
# CONFIG_MFD_PCF50633 is not set
# CONFIG_MFD_SM501 is not set
# CONFIG_MFD_STMPE is not set
@@ -1123,10 +1040,9 @@ CONFIG_MMC_BLOCK_MINORS=8
# CONFIG_MMC_CLKGATE is not set
# CONFIG_MMC_DEBUG is not set
# CONFIG_MMC_DW is not set
-CONFIG_MMC_OMAP=y
-CONFIG_MMC_OMAP_HS=y
# CONFIG_MMC_SDHCI is not set
# CONFIG_MMC_TEST is not set
+# CONFIG_MMC_UNSAFE_RESUME is not set
# CONFIG_MMC_USHC is not set
# CONFIG_MMC_VUB300 is not set
CONFIG_MMU=y
@@ -1150,7 +1066,6 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y
# CONFIG_MOUSE_SERIAL is not set
# CONFIG_MOUSE_SYNAPTICS_I2C is not set
# CONFIG_MOUSE_VSXXXAA is not set
-# CONFIG_MPCORE_WATCHDOG is not set
CONFIG_MSDOS_FS=y
CONFIG_MSDOS_PARTITION=y
CONFIG_MTD=y
@@ -1158,6 +1073,7 @@ CONFIG_MTD=y
# CONFIG_MTD_AFS_PARTS is not set
# CONFIG_MTD_ALAUDA is not set
# CONFIG_MTD_AR7_PARTS is not set
+# CONFIG_MTD_ARM_INTEGRATOR is not set
CONFIG_MTD_BLKDEVS=y
CONFIG_MTD_BLOCK=y
# CONFIG_MTD_BLOCK2MTD is not set
@@ -1199,14 +1115,12 @@ CONFIG_MTD_NAND_ECC=y
CONFIG_MTD_NAND_IDS=y
# CONFIG_MTD_NAND_MUSEUM_IDS is not set
# CONFIG_MTD_NAND_NANDSIM is not set
-CONFIG_MTD_NAND_OMAP2=y
# CONFIG_MTD_NAND_PLATFORM is not set
# CONFIG_MTD_NAND_VERIFY_WRITE is not set
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=y
# CONFIG_MTD_ONENAND_OTP is not set
# CONFIG_MTD_ONENAND_SIM is not set
CONFIG_MTD_ONENAND_VERIFY_WRITE=y
@@ -1332,6 +1246,7 @@ CONFIG_NLS_ISO8859_1=y
# CONFIG_NLS_KOI8_U is not set
# CONFIG_NLS_UTF8 is not set
CONFIG_NOP_TRACER=y
+CONFIG_NOP_USB_XCEIV=y
CONFIG_NO_HZ=y
# CONFIG_NTFS_FS is not set
# CONFIG_N_GSM is not set
@@ -1347,48 +1262,9 @@ CONFIG_OF_IRQ=y
CONFIG_OF_MDIO=y
CONFIG_OF_NET=y
CONFIG_OF_SPI=y
-CONFIG_OMAP2_DSS=y
-# CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS is not set
-CONFIG_OMAP2_DSS_DEBUG_SUPPORT=y
-CONFIG_OMAP2_DSS_DPI=y
-CONFIG_OMAP2_DSS_DSI=y
-CONFIG_OMAP2_DSS_FAKE_VSYNC=y
-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
-CONFIG_OMAP2_VRFB=y
-CONFIG_OMAP3_EMU=y
-# CONFIG_OMAP3_L2_AUX_SECURE_SAVE_RESTORE is not set
-# CONFIG_OMAP3_SDRC_AC_TIMING is not set
-CONFIG_OMAP4_DSS_HDMI=y
-CONFIG_OMAP_32K_TIMER=y
-CONFIG_OMAP_32K_TIMER_HZ=128
-CONFIG_OMAP_DM_TIMER=y
-# CONFIG_OMAP_MBOX_FWK is not set
-CONFIG_OMAP_MCBSP=y
-CONFIG_OMAP_MUX=y
-CONFIG_OMAP_MUX_DEBUG=y
-CONFIG_OMAP_MUX_WARNINGS=y
-CONFIG_OMAP_PACKAGE_CBB=y
-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
-CONFIG_OMAP_WATCHDOG=y
# CONFIG_OMFS_FS is not set
CONFIG_OPROFILE=y
# CONFIG_OSF_PARTITION is not set
-CONFIG_OUTER_CACHE=y
-CONFIG_OUTER_CACHE_SYNC=y
# CONFIG_OVERLAYFS_FS is not set
CONFIG_P54_COMMON=m
CONFIG_P54_LEDS=y
@@ -1398,12 +1274,6 @@ CONFIG_P54_USB=m
CONFIG_PACKET=y
CONFIG_PAGEFLAGS_EXTENDED=y
CONFIG_PAGE_OFFSET=0x80000000
-CONFIG_PANEL_GENERIC_DPI=y
-# CONFIG_PANEL_LGPHILIPS_LB035Q02 is not set
-# CONFIG_PANEL_NEC_NL8048HL11_01B is not set
-# CONFIG_PANEL_SHARP_LS037V7DW01 is not set
-CONFIG_PANEL_TAAL=y
-# CONFIG_PANEL_TPO_TD043MTEA1 is not set
# CONFIG_PANTHERLORD_FF is not set
# CONFIG_PARPORT is not set
CONFIG_PARTITION_ADVANCED=y
@@ -1421,20 +1291,15 @@ CONFIG_PHYLIB=y
# CONFIG_PHYS_ADDR_T_64BIT is not set
# CONFIG_PID_NS is not set
# CONFIG_PLAT_SPEAR is not set
-CONFIG_PLAT_VERSATILE=y
-CONFIG_PLAT_VERSATILE_CLCD=y
-CONFIG_PLAT_VERSATILE_SCHED_CLOCK=y
CONFIG_PM=y
# CONFIG_PMBUS is not set
# CONFIG_PMIC_ADP5520 is not set
# CONFIG_PMIC_DA903X is not set
CONFIG_PM_ADVANCED_DEBUG=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
CONFIG_POSIX_MQUEUE=y
CONFIG_POSIX_MQUEUE_SYSCTL=y
@@ -1501,7 +1366,6 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y
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
@@ -1510,13 +1374,11 @@ CONFIG_RELAY=y
# CONFIG_RFD_FTL is not set
# CONFIG_RFKILL is not set
# CONFIG_RFKILL_REGULATOR is not set
-CONFIG_RFS_ACCEL=y
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_RT2500USB=m
CONFIG_RT2800USB=m
CONFIG_RT2800USB_RT33XX=y
@@ -1576,7 +1438,6 @@ CONFIG_RTC_DRV_PL031=y
# CONFIG_RTC_DRV_S35390A is not set
# CONFIG_RTC_DRV_STK17TA8 is not set
# CONFIG_RTC_DRV_TEST is not set
-CONFIG_RTC_DRV_TWL4030=y
# CONFIG_RTC_DRV_V3020 is not set
# CONFIG_RTC_DRV_X1205 is not set
CONFIG_RTC_HCTOSYS=y
@@ -1603,8 +1464,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
@@ -1756,8 +1615,6 @@ CONFIG_SERIAL_IMX_CONSOLE=y
# CONFIG_SERIAL_MAX3107 is not set
# CONFIG_SERIAL_NONSTANDARD is not set
# CONFIG_SERIAL_OF_PLATFORM is not set
-CONFIG_SERIAL_OMAP=y
-CONFIG_SERIAL_OMAP_CONSOLE=y
# CONFIG_SERIAL_TIMBERDALE is not set
# CONFIG_SERIAL_XILINX_PS_UART is not set
CONFIG_SERIO=y
@@ -1778,8 +1635,6 @@ CONFIG_SLABINFO=y
# CONFIG_SMARTJOYPLUS_FF is not set
# CONFIG_SMC911X is not set
CONFIG_SMC91X=y
-CONFIG_SMP=y
-CONFIG_SMP_ON_UP=y
CONFIG_SMSC911X=y
# CONFIG_SMSC911X_ARCH_HOOKS is not set
CONFIG_SMSC_PHY=y
@@ -1794,6 +1649,7 @@ CONFIG_SND_DEBUG=y
# CONFIG_SND_DEBUG_VERBOSE is not set
CONFIG_SND_DRIVERS=y
# CONFIG_SND_DUMMY is not set
+# CONFIG_SND_DYNAMIC_MINORS is not set
# CONFIG_SND_EMU10K1_SEQ is not set
# CONFIG_SND_HRTIMER is not set
CONFIG_SND_HWDEP=m
@@ -1802,19 +1658,6 @@ CONFIG_SND_JACK=y
CONFIG_SND_MIXER_OSS=m
# CONFIG_SND_MPU401 is not set
# CONFIG_SND_MTPAV is not set
-CONFIG_SND_OMAP_SOC=m
-CONFIG_SND_OMAP_SOC_AM3517EVM=m
-CONFIG_SND_OMAP_SOC_IGEP0020=m
-CONFIG_SND_OMAP_SOC_MCBSP=m
-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_OVERO=m
-# CONFIG_SND_OMAP_SOC_RX51 is not set
-CONFIG_SND_OMAP_SOC_SDP3430=m
-CONFIG_SND_OMAP_SOC_SDP4430=m
-CONFIG_SND_OMAP_SOC_ZOOM2=m
# CONFIG_SND_OPL3_LIB_SEQ is not set
# CONFIG_SND_OPL4_LIB_SEQ is not set
CONFIG_SND_OSSEMUL=y
@@ -1831,9 +1674,6 @@ CONFIG_SND_SOC=m
# CONFIG_SND_SOC_ALL_CODECS is not set
# CONFIG_SND_SOC_CACHE_LZO is not set
CONFIG_SND_SOC_I2C_AND_SPI=m
-CONFIG_SND_SOC_TLV320AIC23=m
-CONFIG_SND_SOC_TWL4030=m
-CONFIG_SND_SOC_TWL6040=m
CONFIG_SND_SPI=y
CONFIG_SND_SUPPORT_OLD_API=y
CONFIG_SND_TIMER=m
@@ -1846,8 +1686,6 @@ CONFIG_SND_VERBOSE_PRINTK=y
CONFIG_SND_VERBOSE_PROCFS=y
CONFIG_SND_VMASTER=y
CONFIG_SOC_IMX51=y
-CONFIG_SOC_OMAP3430=y
-CONFIG_SOC_OMAPTI816X=y
# CONFIG_SOFT_WATCHDOG is not set
# CONFIG_SOLARIS_X86_PARTITION is not set
CONFIG_SOUND=y
@@ -1867,7 +1705,6 @@ 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
CONFIG_SPI_PL022=y
# CONFIG_SPI_PXA2XX_PCI is not set
# CONFIG_SPI_SPIDEV is not set
@@ -1891,7 +1728,6 @@ CONFIG_STACKTRACE_SUPPORT=y
CONFIG_STANDALONE=y
# CONFIG_STE10XP is not set
# CONFIG_STMMAC_ETH is not set
-CONFIG_STOP_MACHINE=y
CONFIG_STRICT_DEVMEM=y
# CONFIG_STRIP_ASM_SYMS is not set
CONFIG_SUNRPC=y
@@ -1932,9 +1768,6 @@ CONFIG_TIMER_STATS=y
# CONFIG_TINY_PREEMPT_RCU is not set
# CONFIG_TINY_RCU is not set
# CONFIG_TIPC is not set
-# CONFIG_TI_DAVINCI_CPDMA is not set
-# CONFIG_TI_DAVINCI_EMAC is not set
-# CONFIG_TI_DAVINCI_MDIO is not set
CONFIG_TMPFS=y
CONFIG_TMPFS_POSIX_ACL=y
CONFIG_TMPFS_XATTR=y
@@ -1980,12 +1813,7 @@ CONFIG_TREE_PREEMPT_RCU=y
# CONFIG_TREE_RCU_TRACE is not set
# CONFIG_TTY_PRINTK is not set
# CONFIG_TUN is not set
-# CONFIG_TWL4030_MADC is not set
-CONFIG_TWL4030_POWER=y
-CONFIG_TWL4030_USB=y
-CONFIG_TWL4030_WATCHDOG=y
-# CONFIG_TWL6030_PWM is not set
-CONFIG_TWL6030_USB=y
+# CONFIG_TWL4030_CORE is not set
# CONFIG_UACCESS_WITH_MEMCPY is not set
CONFIG_UBIFS_FS=y
# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
@@ -2012,13 +1840,13 @@ CONFIG_USB_ALI_M5632=y
CONFIG_USB_AN2720=y
CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
# CONFIG_USB_APPLEDISPLAY is not set
+CONFIG_USB_ARCH_HAS_EHCI=y
CONFIG_USB_ARCH_HAS_HCD=y
+# CONFIG_USB_ARCH_HAS_OHCI is not set
CONFIG_USB_ARMLINUX=y
-# CONFIG_USB_AUDIO is not set
CONFIG_USB_BELKIN=y
# CONFIG_USB_C67X00_HCD is not set
# CONFIG_USB_CATC is not set
-# CONFIG_USB_CDC_COMPOSITE is not set
# CONFIG_USB_CYPRESS_CY7C63 is not set
# CONFIG_USB_CYTHERM is not set
CONFIG_USB_DEBUG=y
@@ -2026,37 +1854,15 @@ CONFIG_USB_DEBUG=y
CONFIG_USB_DEVICE_CLASS=y
# CONFIG_USB_DYNAMIC_MINORS is not set
CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_EHCI_HCD_OMAP=y
CONFIG_USB_EHCI_MXC=y
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
CONFIG_USB_EHCI_TT_NEWSCHED=y
# CONFIG_USB_EMI26 is not set
# CONFIG_USB_EMI62 is not set
CONFIG_USB_EPSON2888=y
-# CONFIG_USB_ETH is not set
-# 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_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_GADGET is not set
# CONFIG_USB_GPIO_VBUS is not set
-# CONFIG_USB_G_DBGP is not set
-# CONFIG_USB_G_HID is not set
-# CONFIG_USB_G_MULTI is not set
-# CONFIG_USB_G_NCM is not set
-# CONFIG_USB_G_PRINTER is not set
-# CONFIG_USB_G_SERIAL is not set
CONFIG_USB_HID=y
# CONFIG_USB_HIDDEV is not set
# CONFIG_USB_HWA_HCD is not set
@@ -2066,6 +1872,7 @@ CONFIG_USB_HID=y
# CONFIG_USB_ISIGHTFW is not set
# CONFIG_USB_ISP116X_HCD is not set
# CONFIG_USB_ISP1362_HCD is not set
+# CONFIG_USB_ISP1760_HCD is not set
# CONFIG_USB_KAWETH is not set
CONFIG_USB_KC2190=y
# CONFIG_USB_LCD is not set
@@ -2073,10 +1880,8 @@ CONFIG_USB_KC2190=y
# CONFIG_USB_LED is not set
# CONFIG_USB_LEGOTOWER is not set
CONFIG_USB_LIBUSUAL=y
-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_NET_AX8817X=y
@@ -2097,11 +1902,7 @@ CONFIG_USB_NET_RNDIS_WLAN=m
# CONFIG_USB_NET_SMSC75XX is not set
CONFIG_USB_NET_SMSC95XX=y
CONFIG_USB_NET_ZAURUS=y
-# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
-# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
-CONFIG_USB_OHCI_HCD=y
-CONFIG_USB_OHCI_HCD_OMAP3=y
-CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+# CONFIG_USB_OTG is not set
# CONFIG_USB_OTG_BLACKLIST_HUB is not set
CONFIG_USB_OTG_UTILS=y
# CONFIG_USB_OTG_WHITELIST is not set
@@ -2145,10 +1946,7 @@ CONFIG_USB_WDM=y
# CONFIG_USB_WUSB_CBAF is not set
# CONFIG_USB_YUREX is not set
CONFIG_USB_ZD1201=m
-CONFIG_USB_ZERO=m
-# CONFIG_USB_ZERO_HNPTEST is not set
# CONFIG_USER_NS is not set
-CONFIG_USE_GENERIC_SMP_HELPERS=y
CONFIG_USE_OF=y
# CONFIG_UTS_NS is not set
CONFIG_VECTORS_BASE=0xffff0000
@@ -2170,6 +1968,7 @@ CONFIG_VT=y
CONFIG_VT_CONSOLE=y
CONFIG_VT_HW_CONSOLE_BINDING=y
# CONFIG_VXFS_FS is not set
+CONFIG_W1=y
CONFIG_W1_CON=y
# CONFIG_W1_MASTER_DS1WM is not set
# CONFIG_W1_MASTER_DS2482 is not set
@@ -2216,7 +2015,6 @@ CONFIG_XFRM_MIGRATE=y
CONFIG_XFRM_USER=y
# CONFIG_XFS_FS is not set
# CONFIG_XIP_KERNEL is not set
-CONFIG_XPS=y
CONFIG_XZ_DEC=y
CONFIG_XZ_DEC_ARM=y
CONFIG_XZ_DEC_ARMTHUMB=y