[ar7] switch to 2.6.37.1

[openwrt.git] / target / linux / omap24xx / config-2.6.37

diff --git a/target/linux/omap24xx/config-2.6.37 b/target/linux/omap24xx/config-2.6.37
index 45ee7dc..8705722 100644 (file)
--- a/target/linux/omap24xx/config-2.6.37
+++ b/target/linux/omap24xx/config-2.6.37
@@ -10,12 +10,9 @@
 CONFIG_AEABI=y
 CONFIG_ALIGNMENT_TRAP=y
 # CONFIG_APM_EMULATION is not set
 CONFIG_AEABI=y
 CONFIG_ALIGNMENT_TRAP=y
 # CONFIG_APM_EMULATION is not set

-# CONFIG_ARCH_CNS3XXX is not set

 CONFIG_ARCH_HAS_CPUFREQ=y
 CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
 CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y
 CONFIG_ARCH_HAS_CPUFREQ=y
 CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
 CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y

-# CONFIG_ARCH_LPC32XX is not set
-# CONFIG_ARCH_NUC93X is not set

 CONFIG_ARCH_OMAP=y
 # CONFIG_ARCH_OMAP1 is not set
 CONFIG_ARCH_OMAP2=y
 CONFIG_ARCH_OMAP=y
 # CONFIG_ARCH_OMAP1 is not set
 CONFIG_ARCH_OMAP2=y


@@ -27,20 +24,11 @@ CONFIG_ARCH_OMAP2PLUS_TYPICAL=y
 # CONFIG_ARCH_OMAP4 is not set
 CONFIG_ARCH_OMAP_OTG=y
 CONFIG_ARCH_REQUIRE_GPIOLIB=y
 # CONFIG_ARCH_OMAP4 is not set
 CONFIG_ARCH_OMAP_OTG=y
 CONFIG_ARCH_REQUIRE_GPIOLIB=y

-# CONFIG_ARCH_S5P6442 is not set
-# CONFIG_ARCH_S5P64X0 is not set
-# CONFIG_ARCH_S5PC100 is not set
-# CONFIG_ARCH_S5PV210 is not set
-# CONFIG_ARCH_S5PV310 is not set

 # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
 # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set

-# CONFIG_ARCH_SHMOBILE is not set

 # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
 # CONFIG_ARCH_SUPPORTS_MSI is not set
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
 # CONFIG_ARCH_SUPPORTS_MSI is not set
 CONFIG_ARCH_SUSPEND_POSSIBLE=y

-# CONFIG_ARCH_TCC_926 is not set
-# CONFIG_ARCH_TEGRA is not set

 # CONFIG_ARCH_USES_GETTIMEOFFSET is not set
 # CONFIG_ARCH_USES_GETTIMEOFFSET is not set

-# CONFIG_ARCH_VEXPRESS is not set

 CONFIG_ARM=y
 CONFIG_ARM_DMA_MEM_BUFFERABLE=y
 CONFIG_ARM_ERRATA_411920=y
 CONFIG_ARM=y
 CONFIG_ARM_DMA_MEM_BUFFERABLE=y
 CONFIG_ARM_ERRATA_411920=y


@@ -49,9 +37,6 @@ CONFIG_ARM_THUMB=y
 CONFIG_ARM_UNWIND=y
 # CONFIG_ARPD is not set
 CONFIG_ATAGS_PROC=y
 CONFIG_ARM_UNWIND=y
 # CONFIG_ARPD is not set
 CONFIG_ATAGS_PROC=y

-# CONFIG_ATH6K_LEGACY is not set
-# CONFIG_AUTO_ZRELADDR is not set
-# CONFIG_BCM_WIMAX is not set

 CONFIG_BINFMT_MISC=y
 CONFIG_BKL=y
 # CONFIG_BLK_DEV_INITRD is not set
 CONFIG_BINFMT_MISC=y
 CONFIG_BKL=y
 # CONFIG_BLK_DEV_INITRD is not set


@@ -59,9 +44,7 @@ CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=4096
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=4096

-# CONFIG_BLK_DEV_RBD is not set

 CONFIG_BLK_DEV_SD=y
 CONFIG_BLK_DEV_SD=y

-# CONFIG_BRCM80211 is not set

 CONFIG_BRIDGE=m
 # CONFIG_BSD_PROCESS_ACCT is not set
 CONFIG_BT=m
 CONFIG_BRIDGE=m
 # CONFIG_BSD_PROCESS_ACCT is not set
 CONFIG_BT=m


@@ -87,9 +70,7 @@ CONFIG_CBUS_TAHVO=y
 CONFIG_CBUS_TAHVO_USER=y
 CONFIG_CBUS_TAHVO_USER_DEBUG=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_CBUS_TAHVO_USER=y
 CONFIG_CBUS_TAHVO_USER_DEBUG=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y

-# CONFIG_CC_STACKPROTECTOR is not set
-# CONFIG_CEPH_LIB is not set
-CONFIG_CMDLINE="root=/dev/mmcblk0p1 rootfstype=ext3,ext2,squashfs,jffs2 console=tty0 console=ttyO2,115200n8 earlyprintk"
+CONFIG_CMDLINE="root=/dev/mmcblk0p1 rootfstype=ext4,ext3,ext2,squashfs,jffs2 console=tty0 console=ttyO2,115200n8 earlyprintk"

 CONFIG_CMDLINE_FORCE=y
 CONFIG_COMMON_CLKDEV=y
 CONFIG_CONSOLE_TRANSLATIONS=y
 CONFIG_CMDLINE_FORCE=y
 CONFIG_COMMON_CLKDEV=y
 CONFIG_CONSOLE_TRANSLATIONS=y


@@ -153,15 +134,14 @@ CONFIG_CRYPTO_SHA1=y
 CONFIG_CRYPTO_WORKQUEUE=y
 # CONFIG_CRYPTO_ZLIB is not set
 CONFIG_DEBUG_BUGVERBOSE=y
 CONFIG_CRYPTO_WORKQUEUE=y
 # CONFIG_CRYPTO_ZLIB is not set
 CONFIG_DEBUG_BUGVERBOSE=y

+CONFIG_DEBUG_ERRORS=y

 # CONFIG_DEBUG_FS is not set
 CONFIG_DEBUG_KERNEL=y
 # CONFIG_DEBUG_FS is not set
 CONFIG_DEBUG_KERNEL=y

-CONFIG_DEBUG_MEMORY_INIT=y

 CONFIG_DEBUG_USER=y
 CONFIG_DECOMPRESS_LZMA=y
 CONFIG_DEFAULT_CFQ=y
 CONFIG_DEFAULT_IOSCHED="cfq"
 CONFIG_DEFAULT_TCP_CONG="cubic"
 CONFIG_DEBUG_USER=y
 CONFIG_DECOMPRESS_LZMA=y
 CONFIG_DEFAULT_CFQ=y
 CONFIG_DEFAULT_IOSCHED="cfq"
 CONFIG_DEFAULT_TCP_CONG="cubic"

-# CONFIG_DEPRECATED_PARAM_STRUCT is not set

 CONFIG_DEVKMEM=y
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_DEVKMEM=y
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y


@@ -199,15 +179,11 @@ CONFIG_FONT_8x8=y
 # CONFIG_FONT_PEARL_8x8 is not set
 # CONFIG_FONT_SUN12x22 is not set
 # CONFIG_FONT_SUN8x16 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_FREEZER=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
 # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
 # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
 CONFIG_FREEZER=y

-CONFIG_FS_MBCACHE=y

 CONFIG_FS_POSIX_ACL=y
 CONFIG_FS_POSIX_ACL=y

-CONFIG_FS_XIP=y
-# CONFIG_FT1000 is not set

 CONFIG_GENERIC_ACL=y
 CONFIG_GENERIC_ATOMIC64=y
 CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_GENERIC_ACL=y
 CONFIG_GENERIC_ATOMIC64=y
 CONFIG_GENERIC_CLOCKEVENTS=y


@@ -216,10 +192,7 @@ CONFIG_GENERIC_FIND_LAST_BIT=y
 CONFIG_GENERIC_GPIO=y
 CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
 CONFIG_GPIOLIB=y
 CONFIG_GENERIC_GPIO=y
 CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
 CONFIG_GPIOLIB=y

-# CONFIG_GPIO_74X164 is not set
-# CONFIG_GPIO_BASIC_MMIO is not set

 CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_SYSFS=y

-# CONFIG_GPIO_VX855 is not set

 # CONFIG_HAMRADIO is not set
 CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_HAS_DMA=y
 # CONFIG_HAMRADIO is not set
 CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_HAS_DMA=y


@@ -247,12 +220,9 @@ CONFIG_HAVE_PROC_CPU=y
 CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
 CONFIG_HID=y
 CONFIG_HID_APPLE=m
 CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
 CONFIG_HID=y
 CONFIG_HID_APPLE=m

-# CONFIG_HID_ROCCAT_PYRA is not set

 CONFIG_HID_SUPPORT=y
 CONFIG_HID_SUPPORT=y

-# CONFIG_HID_UCLOGIC is not set

 CONFIG_HID_WACOM=m
 # CONFIG_HID_WACOM_POWER_SUPPLY is not set
 CONFIG_HID_WACOM=m
 # CONFIG_HID_WACOM_POWER_SUPPLY is not set

-# CONFIG_HID_WALTOP is not set

 CONFIG_HWMON=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
 CONFIG_HW_CONSOLE=y
 CONFIG_HWMON=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
 CONFIG_HW_CONSOLE=y


@@ -304,12 +274,10 @@ CONFIG_IPV6_SIT=m
 # CONFIG_IP_MROUTE is not set
 CONFIG_IR_CORE=m
 CONFIG_IR_LIRC_CODEC=m
 # CONFIG_IP_MROUTE is not set
 CONFIG_IR_CORE=m
 CONFIG_IR_LIRC_CODEC=m

-# CONFIG_IR_MCEUSB is not set

 CONFIG_IR_RC5_SZ_DECODER=m
 CONFIG_IR_RC5_SZ_DECODER=m

-# CONFIG_IR_STREAMZAP is not set

 # CONFIG_ISDN is not set
 # CONFIG_ISP1301_OMAP is not set
 # CONFIG_ISDN is not set
 # CONFIG_ISP1301_OMAP is not set

-CONFIG_JBD=y
+CONFIG_JBD2=y

 CONFIG_JFFS2_LZO=y
 CONFIG_JFFS2_ZLIB=y
 # CONFIG_JOYSTICK_A3D is not set
 CONFIG_JFFS2_LZO=y
 CONFIG_JFFS2_ZLIB=y
 # CONFIG_JOYSTICK_A3D is not set


@@ -335,28 +303,18 @@ CONFIG_JFFS2_ZLIB=y
 # CONFIG_JOYSTICK_ZHENHUA is not set
 CONFIG_KALLSYMS=y
 CONFIG_KEXEC=y
 # CONFIG_JOYSTICK_ZHENHUA is not set
 CONFIG_KALLSYMS=y
 CONFIG_KEXEC=y

-# CONFIG_KEYBOARD_ATKBD is not set

 # CONFIG_KEYBOARD_GPIO is not set
 # CONFIG_KEYBOARD_GPIO is not set

-# CONFIG_KEYBOARD_LKKBD is not set

 CONFIG_KEYBOARD_LM8323=y
 CONFIG_KEYBOARD_LM8323=y

-# CONFIG_KEYBOARD_MATRIX is not set
-# CONFIG_KEYBOARD_MCS is not set
-# CONFIG_KEYBOARD_NEWTON is not set

 # CONFIG_KEYBOARD_OMAP is not set
 # CONFIG_KEYBOARD_OMAP is not set

-# CONFIG_KEYBOARD_STOWAWAY is not set
-# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_XTKBD is not set

 CONFIG_KEYS=y
 # CONFIG_KEYS_DEBUG_PROC_KEYS is not set
 # CONFIG_KXSD9 is not set
 CONFIG_KEYS=y
 # CONFIG_KEYS_DEBUG_PROC_KEYS is not set
 # CONFIG_KXSD9 is not set

-# CONFIG_LBDAF is not set

 CONFIG_LEDS=y
 # CONFIG_LEDS_GPIO is not set
 # CONFIG_LEDS_REGULATOR is not set
 CONFIG_LEDS_TRIGGER_BACKLIGHT=y
 CONFIG_LEDS_TRIGGER_GPIO=y
 CONFIG_LIRC=m
 CONFIG_LEDS=y
 # CONFIG_LEDS_GPIO is not set
 # CONFIG_LEDS_REGULATOR is not set
 CONFIG_LEDS_TRIGGER_BACKLIGHT=y
 CONFIG_LEDS_TRIGGER_GPIO=y
 CONFIG_LIRC=m

-# CONFIG_LIRC_STAGING is not set

 # CONFIG_LIS3L02DQ is not set
 CONFIG_LLC=m
 CONFIG_LOCKD=m
 # CONFIG_LIS3L02DQ is not set
 CONFIG_LLC=m
 CONFIG_LOCKD=m


@@ -384,6 +342,8 @@ CONFIG_MEDIA_TUNER=m
 CONFIG_MEDIA_TUNER_MC44S803=m
 CONFIG_MEDIA_TUNER_MT20XX=m
 CONFIG_MEDIA_TUNER_SIMPLE=m
 CONFIG_MEDIA_TUNER_MC44S803=m
 CONFIG_MEDIA_TUNER_MT20XX=m
 CONFIG_MEDIA_TUNER_SIMPLE=m

+CONFIG_MEDIA_TUNER_TDA18271=m
+CONFIG_MEDIA_TUNER_TDA827X=m

 CONFIG_MEDIA_TUNER_TDA8290=m
 CONFIG_MEDIA_TUNER_TDA9887=m
 CONFIG_MEDIA_TUNER_TEA5761=m
 CONFIG_MEDIA_TUNER_TDA8290=m
 CONFIG_MEDIA_TUNER_TDA9887=m
 CONFIG_MEDIA_TUNER_TEA5761=m


@@ -391,20 +351,15 @@ CONFIG_MEDIA_TUNER_TEA5767=m
 CONFIG_MEDIA_TUNER_XC2028=m
 CONFIG_MEDIA_TUNER_XC5000=m
 CONFIG_MENELAUS=y
 CONFIG_MEDIA_TUNER_XC2028=m
 CONFIG_MEDIA_TUNER_XC5000=m
 CONFIG_MENELAUS=y

-# CONFIG_MFD_MC13XXX is not set

 # CONFIG_MFD_T7L66XB is not set
 # CONFIG_MFD_T7L66XB is not set

-# CONFIG_MFD_WM831X_I2C is not set
-# CONFIG_MFD_WM831X_SPI is not set

 # CONFIG_MISC_DEVICES is not set
 CONFIG_MMC=y
 CONFIG_MMC_BLOCK=y
 # CONFIG_MISC_DEVICES is not set
 CONFIG_MMC=y
 CONFIG_MMC_BLOCK=y

-CONFIG_MMC_BLOCK_MINORS=8

 CONFIG_MMC_OMAP=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_PLTFM=y
 CONFIG_MMC_SPI=y
 CONFIG_MMC_UNSAFE_RESUME=y
 CONFIG_MMC_OMAP=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_PLTFM=y
 CONFIG_MMC_SPI=y
 CONFIG_MMC_UNSAFE_RESUME=y

-# CONFIG_MMC_USHC is not set

 # CONFIG_MOUSE_BCM5974 is not set
 # CONFIG_MOUSE_GPIO is not set
 CONFIG_MOUSE_PS2=y
 # CONFIG_MOUSE_BCM5974 is not set
 # CONFIG_MOUSE_GPIO is not set
 CONFIG_MOUSE_PS2=y


@@ -431,12 +386,11 @@ CONFIG_MTD_ONENAND_OTP=y
 # CONFIG_MTD_ROOTFS_ROOT_DEV is not set
 # CONFIG_MTD_ROOTFS_SPLIT is not set
 # CONFIG_MUSB_PIO_ONLY is not set
 # CONFIG_MTD_ROOTFS_ROOT_DEV is not set
 # CONFIG_MTD_ROOTFS_SPLIT is not set
 # CONFIG_MUSB_PIO_ONLY is not set

-CONFIG_N810BM=y
+# CONFIG_N810BM is not set

 CONFIG_NAMESPACES=y
 CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_NEED_PER_CPU_KM=y
 CONFIG_NETDEV_10000=y
 CONFIG_NAMESPACES=y
 CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_NEED_PER_CPU_KM=y
 CONFIG_NETDEV_10000=y

-# CONFIG_NET_IPGRE_DEMUX is not set

 # CONFIG_NET_NS is not set
 # CONFIG_NET_SCHED is not set
 CONFIG_NFSD=m
 # CONFIG_NET_NS is not set
 # CONFIG_NET_SCHED is not set
 CONFIG_NFSD=m


@@ -480,10 +434,8 @@ CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PAGE_OFFSET=0xC0000000
 # CONFIG_PCI_SYSCALL is not set
 CONFIG_PERF_USE_VMALLOC=y
 CONFIG_PAGE_OFFSET=0xC0000000
 # CONFIG_PCI_SYSCALL is not set
 CONFIG_PERF_USE_VMALLOC=y

-# CONFIG_PLAT_SPEAR is not set

 CONFIG_PM=y
 # CONFIG_PM_DEBUG is not set
 CONFIG_PM=y
 # CONFIG_PM_DEBUG is not set

-# CONFIG_PM_OPP is not set

 CONFIG_PM_OPS=y
 CONFIG_PM_RUNTIME=y
 CONFIG_PM_SLEEP=y
 CONFIG_PM_OPS=y
 CONFIG_PM_RUNTIME=y
 CONFIG_PM_SLEEP=y


@@ -503,7 +455,6 @@ CONFIG_PREEMPT=y
 CONFIG_PRINTK_TIME=y
 CONFIG_PROC_PAGE_MONITOR=y
 # CONFIG_QUOTACTL is not set
 CONFIG_PRINTK_TIME=y
 CONFIG_PROC_PAGE_MONITOR=y
 # CONFIG_QUOTACTL is not set

-# CONFIG_R8712U is not set

 CONFIG_REGULATOR=y
 # CONFIG_REGULATOR_AD5398 is not set
 # CONFIG_REGULATOR_DEBUG is not set
 CONFIG_REGULATOR=y
 # CONFIG_REGULATOR_AD5398 is not set
 # CONFIG_REGULATOR_DEBUG is not set


@@ -523,28 +474,22 @@ CONFIG_SCSI=y
 # CONFIG_SCSI_LOWLEVEL is not set
 # CONFIG_SDIO_UART is not set
 # CONFIG_SENSORS_AK8975 is not set
 # CONFIG_SCSI_LOWLEVEL is not set
 # CONFIG_SDIO_UART is not set
 # CONFIG_SENSORS_AK8975 is not set

-# CONFIG_SENSORS_GPIO_FAN is not set

 # CONFIG_SENSORS_HMC5843 is not set
 # CONFIG_SENSORS_ISL29018 is not set
 CONFIG_SENSORS_LM75=m
 # CONFIG_SENSORS_HMC5843 is not set
 # CONFIG_SENSORS_ISL29018 is not set
 CONFIG_SENSORS_LM75=m

-# CONFIG_SENSORS_LTC4261 is not set

 CONFIG_SENSORS_TSL2563=m
 CONFIG_SENSORS_TSL2563=m

-# CONFIG_SENSORS_W83795 is not set

 CONFIG_SERIAL_8250_NR_UARTS=4
 CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 CONFIG_SERIAL_OMAP=y
 CONFIG_SERIAL_OMAP_CONSOLE=y
 CONFIG_SERIO=y
 CONFIG_SERIO_LIBPS2=y
 CONFIG_SERIAL_8250_NR_UARTS=4
 CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 CONFIG_SERIAL_OMAP=y
 CONFIG_SERIAL_OMAP_CONSOLE=y
 CONFIG_SERIO=y
 CONFIG_SERIO_LIBPS2=y

-# CONFIG_SERIO_PS2MULT is not set

 # CONFIG_SERIO_RAW is not set
 CONFIG_SERIO_SERPORT=y
 # CONFIG_SLAB is not set
 CONFIG_SLHC=m
 CONFIG_SLUB=y
 # CONFIG_SERIO_RAW is not set
 CONFIG_SERIO_SERPORT=y
 # CONFIG_SLAB is not set
 CONFIG_SLHC=m
 CONFIG_SLUB=y

-# CONFIG_SLUB_STATS is not set

 CONFIG_SND=m
 CONFIG_SND=m

-# CONFIG_SND_ALOOP is not set

 CONFIG_SND_ARM=y
 # CONFIG_SND_EMU10K1_SEQ is not set
 CONFIG_SND_JACK=y
 CONFIG_SND_ARM=y
 # CONFIG_SND_EMU10K1_SEQ is not set
 CONFIG_SND_JACK=y


@@ -568,16 +513,12 @@ CONFIG_SND_TIMER=m
 CONFIG_SOUND=m
 CONFIG_SOUND_OSS_CORE=y
 CONFIG_SOUND_OSS_CORE_PRECLAIM=y
 CONFIG_SOUND=m
 CONFIG_SOUND_OSS_CORE=y
 CONFIG_SOUND_OSS_CORE_PRECLAIM=y

-# CONFIG_SPARSE_RCU_POINTER is not set
-# CONFIG_SPEAKUP is not set

 CONFIG_SPI=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_GPIO is not set
 CONFIG_SPI_MASTER=y
 CONFIG_SPI_OMAP24XX=y
 CONFIG_SPI=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_GPIO is not set
 CONFIG_SPI_MASTER=y
 CONFIG_SPI_OMAP24XX=y

-# CONFIG_STMMAC_ETH is not set

 CONFIG_STP=m
 CONFIG_STP=m

-# CONFIG_STRICT_DEVMEM is not set

 # CONFIG_STRIP_ASM_SYMS is not set
 CONFIG_SUNRPC=m
 CONFIG_SUNRPC_GSS=m
 # CONFIG_STRIP_ASM_SYMS is not set
 CONFIG_SUNRPC=m
 CONFIG_SUNRPC_GSS=m


@@ -599,11 +540,9 @@ CONFIG_TCP_CONG_CUBIC=y
 # CONFIG_TEST_LIST_SORT is not set
 # CONFIG_TINY_PREEMPT_RCU is not set
 CONFIG_TMPFS_POSIX_ACL=y
 # CONFIG_TEST_LIST_SORT is not set
 # CONFIG_TINY_PREEMPT_RCU is not set
 CONFIG_TMPFS_POSIX_ACL=y

-# CONFIG_TOUCHSCREEN_BU21013 is not set

 # CONFIG_TOUCHSCREEN_DYNAPRO is not set
 # CONFIG_TOUCHSCREEN_HAMPSHIRE is not set
 CONFIG_TOUCHSCREEN_TSC2005=y
 # CONFIG_TOUCHSCREEN_DYNAPRO is not set
 # CONFIG_TOUCHSCREEN_HAMPSHIRE is not set
 CONFIG_TOUCHSCREEN_TSC2005=y

-# CONFIG_TTY_PRINTK is not set

 CONFIG_TUN=m
 CONFIG_UACCESS_WITH_MEMCPY=y
 CONFIG_UID16=y
 CONFIG_TUN=m
 CONFIG_UACCESS_WITH_MEMCPY=y
 CONFIG_UID16=y


@@ -611,7 +550,6 @@ CONFIG_USB=m
 # CONFIG_USB_ARCH_HAS_EHCI is not set
 # CONFIG_USB_AUDIO is not set
 # CONFIG_USB_CDC_COMPOSITE is not set
 # CONFIG_USB_ARCH_HAS_EHCI is not set
 # CONFIG_USB_AUDIO is not set
 # CONFIG_USB_CDC_COMPOSITE is not set

-# CONFIG_USB_ENESTORAGE is not set

 CONFIG_USB_ETH=m
 # CONFIG_USB_ETH_EEM is not set
 # CONFIG_USB_ETH_RNDIS is not set
 CONFIG_USB_ETH=m
 # CONFIG_USB_ETH_EEM is not set
 # CONFIG_USB_ETH_RNDIS is not set


@@ -629,10 +567,6 @@ CONFIG_USB_GADGET_MUSB_HDRC=y
 CONFIG_USB_GADGET_SELECTED=y
 CONFIG_USB_GADGET_VBUS_DRAW=100
 CONFIG_USB_GSPCA=m
 CONFIG_USB_GADGET_SELECTED=y
 CONFIG_USB_GADGET_VBUS_DRAW=100
 CONFIG_USB_GSPCA=m

-# CONFIG_USB_GSPCA_KONICA is not set
-# CONFIG_USB_GSPCA_SPCA1528 is not set
-# CONFIG_USB_GSPCA_SQ930X is not set
-# CONFIG_USB_GSPCA_XIRLINK_CIT is not set

 # CONFIG_USB_G_DBGP is not set
 # CONFIG_USB_G_HID is not set
 # CONFIG_USB_G_PRINTER is not set
 # CONFIG_USB_G_DBGP is not set
 # CONFIG_USB_G_HID is not set
 # CONFIG_USB_G_PRINTER is not set


@@ -648,23 +582,14 @@ CONFIG_USB_MUSB_HDRC_HCD=y
 # CONFIG_USB_MUSB_HOST is not set
 CONFIG_USB_MUSB_OTG=y
 # CONFIG_USB_MUSB_PERIPHERAL is not set
 # CONFIG_USB_MUSB_HOST is not set
 CONFIG_USB_MUSB_OTG=y
 # CONFIG_USB_MUSB_PERIPHERAL is not set

-# CONFIG_USB_NET_CX82310_ETH is not set
-# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
-# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
-CONFIG_USB_OHCI_HCD=m
-CONFIG_USB_OHCI_HCD_OMAP1=y

 CONFIG_USB_OTG=y
 CONFIG_USB_OTG_UTILS=y
 # CONFIG_USB_PWC is not set
 CONFIG_USB_SERIAL=m
 CONFIG_USB_OTG=y
 CONFIG_USB_OTG_UTILS=y
 # CONFIG_USB_PWC is not set
 CONFIG_USB_SERIAL=m

-# CONFIG_USB_SERIAL_SAMBA is not set

 CONFIG_USB_SUPPORT=y
 # CONFIG_USB_TI_CPPI_DMA is not set
 CONFIG_USB_SUPPORT=y
 # CONFIG_USB_TI_CPPI_DMA is not set

-CONFIG_USB_TUSB6010=y
-CONFIG_USB_TUSB_OMAP_DMA=y
-# CONFIG_USB_UAS is not set
+# CONFIG_USB_TUSB6010 is not set

 CONFIG_USB_USBNET=m
 CONFIG_USB_USBNET=m

-# CONFIG_USB_YUREX is not set

 # CONFIG_USB_ZERO is not set
 # CONFIG_USER_NS is not set
 CONFIG_V4L_USB_DRIVERS=y
 # CONFIG_USB_ZERO is not set
 # CONFIG_USER_NS is not set
 CONFIG_V4L_USB_DRIVERS=y


@@ -680,7 +605,6 @@ CONFIG_VIDEO_IR_I2C=m
 CONFIG_VIDEO_MEDIA=m
 # CONFIG_VIDEO_OMAP2 is not set
 # CONFIG_VIDEO_OMAP2_VOUT is not set
 CONFIG_VIDEO_MEDIA=m
 # CONFIG_VIDEO_OMAP2 is not set
 # CONFIG_VIDEO_OMAP2_VOUT is not set

-# CONFIG_VIDEO_SR030PC30 is not set

 CONFIG_VIDEO_TCM825X=m
 CONFIG_VIDEO_V4L1=m
 CONFIG_VIDEO_V4L2=m
 CONFIG_VIDEO_TCM825X=m
 CONFIG_VIDEO_V4L1=m
 CONFIG_VIDEO_V4L2=m