[ar7] refresh 2.6.32 patches

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

diff --git a/target/linux/omap24xx/config-2.6.36 b/target/linux/omap24xx/config-2.6.36
index 065f3ec..cbbc5b5 100644 (file)
--- a/target/linux/omap24xx/config-2.6.36
+++ b/target/linux/omap24xx/config-2.6.36
@@ -61,6 +61,8 @@ CONFIG_BT_BNEP=m
 # CONFIG_BT_BNEP_MC_FILTER is not set
 # CONFIG_BT_BNEP_PROTO_FILTER is not set
 CONFIG_BT_HCIH4P=m
+CONFIG_BT_HCIUART=m
+# CONFIG_BT_HCIUART_ATH3K is not set
 CONFIG_BT_HIDP=m
 CONFIG_BT_L2CAP=m
 CONFIG_BT_RFCOMM=m
@@ -116,7 +118,6 @@ CONFIG_CPU_IDLE_GOV_MENU=y
 CONFIG_CPU_PABRT_V6=y
 CONFIG_CPU_TLB_V6=y
 CONFIG_CPU_V6=y
-# CONFIG_CRASHLOG is not set
 CONFIG_CRC16=y
 CONFIG_CRC7=y
 CONFIG_CRC_CCITT=y
@@ -134,9 +135,7 @@ CONFIG_CRYPTO_HASH2=y
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MANAGER2=y
-CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
 CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_PCOMP2=y
 CONFIG_CRYPTO_RNG=y
 CONFIG_CRYPTO_RNG2=y
 CONFIG_CRYPTO_SHA1=y
@@ -170,14 +169,13 @@ CONFIG_EXT3_FS=y
 CONFIG_EXT3_FS_POSIX_ACL=y
 # CONFIG_EXT3_FS_SECURITY is not set
 CONFIG_EXT3_FS_XATTR=y
-# CONFIG_FANOTIFY is not set
 CONFIG_FAT_FS=y
 CONFIG_FB=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_IMAGEBLIT=y
 CONFIG_FB_OMAP=y
-CONFIG_FB_OMAP_BOOTLOADER_INIT=y
+# CONFIG_FB_OMAP_BOOTLOADER_INIT is not set
 CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=2
 CONFIG_FB_OMAP_LCDC_BLIZZARD=y
 CONFIG_FB_OMAP_LCDC_EXTERNAL=y
@@ -241,6 +239,7 @@ CONFIG_HAVE_PERF_EVENTS=y
 CONFIG_HAVE_PROC_CPU=y
 CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
 CONFIG_HID=y
+# CONFIG_HID_ACRUX_FF is not set
 CONFIG_HID_APPLE=m
 # CONFIG_HID_ELECOM is not set
 CONFIG_HID_SUPPORT=y
@@ -268,7 +267,6 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=m
 CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 CONFIG_INET_TUNNEL=m
-CONFIG_INET_XFRM_MODE_BEET=y
 # CONFIG_INLINE_READ_UNLOCK is not set
 # CONFIG_INLINE_READ_UNLOCK_IRQ is not set
 # CONFIG_INLINE_SPIN_UNLOCK is not set
@@ -277,13 +275,17 @@ CONFIG_INET_XFRM_MODE_BEET=y
 # CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set
 CONFIG_INOTIFY_USER=y
 CONFIG_INPUT=y
+# CONFIG_INPUT_ADXL34X is not set
 CONFIG_INPUT_EVDEV=y
+# CONFIG_INPUT_GPIO_BUTTONS is not set
+CONFIG_INPUT_JOYSTICK=y
 CONFIG_INPUT_KEYBOARD=y
-# CONFIG_INPUT_MISC is not set
+CONFIG_INPUT_MOUSE=y
 CONFIG_INPUT_MOUSEDEV=y
 # CONFIG_INPUT_MOUSEDEV_PSAUX is not set
 CONFIG_INPUT_MOUSEDEV_SCREEN_X=800
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=480
+CONFIG_INPUT_TABLET=y
 CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_IOSCHED_CFQ=y
 # CONFIG_IOSCHED_DEADLINE is not set
@@ -303,6 +305,27 @@ CONFIG_IR_LIRC_CODEC=m
 CONFIG_JBD=y
 CONFIG_JFFS2_LZO=y
 CONFIG_JFFS2_ZLIB=y
+# CONFIG_JOYSTICK_A3D is not set
+# CONFIG_JOYSTICK_ADI is not set
+# CONFIG_JOYSTICK_ANALOG is not set
+# CONFIG_JOYSTICK_COBRA is not set
+# CONFIG_JOYSTICK_GF2K is not set
+# CONFIG_JOYSTICK_GRIP is not set
+# CONFIG_JOYSTICK_GRIP_MP is not set
+# CONFIG_JOYSTICK_GUILLEMOT is not set
+# CONFIG_JOYSTICK_IFORCE is not set
+# CONFIG_JOYSTICK_INTERACT is not set
+# CONFIG_JOYSTICK_JOYDUMP is not set
+# CONFIG_JOYSTICK_MAGELLAN is not set
+# CONFIG_JOYSTICK_SIDEWINDER is not set
+# CONFIG_JOYSTICK_SPACEBALL is not set
+# CONFIG_JOYSTICK_SPACEORB is not set
+# CONFIG_JOYSTICK_STINGER is not set
+# CONFIG_JOYSTICK_TMDC is not set
+# CONFIG_JOYSTICK_TWIDJOY is not set
+# CONFIG_JOYSTICK_WARRIOR is not set
+# CONFIG_JOYSTICK_XPAD is not set
+# CONFIG_JOYSTICK_ZHENHUA is not set
 CONFIG_KALLSYMS=y
 CONFIG_KEXEC=y
 # CONFIG_KEYBOARD_ATKBD is not set
@@ -371,6 +394,17 @@ CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_PLTFM=y
 CONFIG_MMC_SPI=y
 CONFIG_MMC_UNSAFE_RESUME=y
+# CONFIG_MOUSE_BCM5974 is not set
+# CONFIG_MOUSE_GPIO is not set
+CONFIG_MOUSE_PS2=y
+CONFIG_MOUSE_PS2_ALPS=y
+# CONFIG_MOUSE_PS2_ELANTECH is not set
+CONFIG_MOUSE_PS2_LOGIPS2PP=y
+CONFIG_MOUSE_PS2_SYNAPTICS=y
+# CONFIG_MOUSE_PS2_TOUCHKIT is not set
+CONFIG_MOUSE_PS2_TRACKPOINT=y
+# CONFIG_MOUSE_SERIAL is not set
+# CONFIG_MOUSE_VSXXXAA is not set
 CONFIG_MSDOS_FS=y
 CONFIG_MTD_BLOCK2MTD=y
 # CONFIG_MTD_CFI is not set
@@ -390,7 +424,6 @@ CONFIG_N810BM=y
 CONFIG_NAMESPACES=y
 CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_NETDEV_10000=y
-# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
 # CONFIG_NET_NS is not set
 # CONFIG_NET_SCHED is not set
 CONFIG_NLS=y
@@ -404,6 +437,7 @@ CONFIG_OMAP_BOOT_REASON=y
 CONFIG_OMAP_BOOT_TAG=y
 CONFIG_OMAP_COMPONENT_VERSION=y
 CONFIG_OMAP_DM_TIMER=y
+CONFIG_OMAP_GPIO_SWITCH=y
 CONFIG_OMAP_MBOX_FWK=y
 CONFIG_OMAP_MBOX_KFIFO_SIZE=256
 CONFIG_OMAP_MCBSP=y
@@ -466,7 +500,7 @@ CONFIG_SERIAL_8250_NR_UARTS=4
 CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 # CONFIG_SERIAL_MAX3107 is not set
 CONFIG_SERIO=y
-# CONFIG_SERIO_LIBPS2 is not set
+CONFIG_SERIO_LIBPS2=y
 # CONFIG_SERIO_RAW is not set
 CONFIG_SERIO_SERPORT=y
 # CONFIG_SLAB is not set
@@ -512,6 +546,11 @@ CONFIG_SUSPEND_NVS=y
 # CONFIG_SYSCTL_SYSCALL is not set
 # CONFIG_SYSCTL_SYSCALL_CHECK is not set
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+# CONFIG_TABLET_USB_ACECAD is not set
+# CONFIG_TABLET_USB_AIPTEK is not set
+# CONFIG_TABLET_USB_GTCO is not set
+# CONFIG_TABLET_USB_KBTAB is not set
+# CONFIG_TABLET_USB_WACOM is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_TMPFS_POSIX_ACL=y
@@ -545,11 +584,15 @@ CONFIG_USB_GADGET_MUSB_HDRC=y
 # CONFIG_USB_GADGET_R8A66597 is not set
 CONFIG_USB_GADGET_SELECTED=y
 CONFIG_USB_GADGET_VBUS_DRAW=100
+CONFIG_USB_GSPCA=m
+# CONFIG_USB_GSPCA_SPCA1528 is not set
+# CONFIG_USB_GSPCA_SQ930X 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_SERIAL is not set
 # CONFIG_USB_G_WEBCAM is not set
+CONFIG_USB_HID=m
 # CONFIG_USB_INVENTRA_DMA is not set
 # CONFIG_USB_MIDI_GADGET is not set
 CONFIG_USB_MUSB_DEBUG=y
@@ -565,6 +608,8 @@ 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_SERIAL_SSU100 is not set
 CONFIG_USB_SUPPORT=y
 # CONFIG_USB_TI_CPPI_DMA is not set
 CONFIG_USB_TUSB6010=y
@@ -597,4 +642,3 @@ CONFIG_WATCHDOG_NOWAYOUT=y
 CONFIG_ZBOOT_ROM_BSS=0x10200000
 CONFIG_ZBOOT_ROM_TEXT=0x10C08000
 CONFIG_ZONE_DMA_FLAG=0
-# CONFIG_ZRAM is not set