summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2012-05-29 09:42:19 +0200
committerDenys Dmytriyenko <denys@ti.com>2012-05-31 19:28:55 -0400
commit4f684c71cc3a1624bc5fa26bfe02e963ee4b22ca (patch)
tree6a54d2bae027c7e3b8fb92aea7bde8a215187e15
parent67088ec673a440947daa4da1af9da5115a3c9ee2 (diff)
downloadmeta-ti-4f684c71cc3a1624bc5fa26bfe02e963ee4b22ca.tar.gz
linux-mainline 3.2.18: build in usbhid and tsc2007 and run 'make oldconfig'
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
-rw-r--r--recipes-kernel/linux/linux-mainline-3.2/beagleboard/defconfig16
1 files changed, 5 insertions, 11 deletions
diff --git a/recipes-kernel/linux/linux-mainline-3.2/beagleboard/defconfig b/recipes-kernel/linux/linux-mainline-3.2/beagleboard/defconfig
index e9a83e64..eaf95481 100644
--- a/recipes-kernel/linux/linux-mainline-3.2/beagleboard/defconfig
+++ b/recipes-kernel/linux/linux-mainline-3.2/beagleboard/defconfig
@@ -1,6 +1,6 @@
1# 1#
2# Automatically generated file; DO NOT EDIT. 2# Automatically generated file; DO NOT EDIT.
3# Linux/arm 3.2.16 Kernel Configuration 3# Linux/arm 3.2.18 Kernel Configuration
4# 4#
5CONFIG_ARM=y 5CONFIG_ARM=y
6CONFIG_SYS_SUPPORTS_APM_EMULATION=y 6CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -461,7 +461,7 @@ CONFIG_USE_OF=y
461CONFIG_ZBOOT_ROM_TEXT=0x0 461CONFIG_ZBOOT_ROM_TEXT=0x0
462CONFIG_ZBOOT_ROM_BSS=0x0 462CONFIG_ZBOOT_ROM_BSS=0x0
463# CONFIG_ARM_APPENDED_DTB is not set 463# CONFIG_ARM_APPENDED_DTB is not set
464CONFIG_CMDLINE="root=/dev/mmcblk0p2 rootwait console=ttyO2,115200" 464CONFIG_CMDLINE=" debug "
465CONFIG_CMDLINE_FROM_BOOTLOADER=y 465CONFIG_CMDLINE_FROM_BOOTLOADER=y
466# CONFIG_CMDLINE_EXTEND is not set 466# CONFIG_CMDLINE_EXTEND is not set
467# CONFIG_CMDLINE_FORCE is not set 467# CONFIG_CMDLINE_FORCE is not set
@@ -1890,7 +1890,7 @@ CONFIG_TOUCHSCREEN_USB_NEXIO=y
1890CONFIG_TOUCHSCREEN_TOUCHIT213=m 1890CONFIG_TOUCHSCREEN_TOUCHIT213=m
1891CONFIG_TOUCHSCREEN_TSC_SERIO=m 1891CONFIG_TOUCHSCREEN_TSC_SERIO=m
1892CONFIG_TOUCHSCREEN_TSC2005=m 1892CONFIG_TOUCHSCREEN_TSC2005=m
1893CONFIG_TOUCHSCREEN_TSC2007=m 1893CONFIG_TOUCHSCREEN_TSC2007=y
1894CONFIG_TOUCHSCREEN_W90X900=m 1894CONFIG_TOUCHSCREEN_W90X900=m
1895CONFIG_TOUCHSCREEN_ST1232=m 1895CONFIG_TOUCHSCREEN_ST1232=m
1896CONFIG_TOUCHSCREEN_TPS6507X=m 1896CONFIG_TOUCHSCREEN_TPS6507X=m
@@ -3012,17 +3012,11 @@ CONFIG_HIDRAW=y
3012# 3012#
3013# USB Input Devices 3013# USB Input Devices
3014# 3014#
3015CONFIG_USB_HID=m 3015CONFIG_USB_HID=y
3016CONFIG_HID_PID=y 3016CONFIG_HID_PID=y
3017CONFIG_USB_HIDDEV=y 3017CONFIG_USB_HIDDEV=y
3018 3018
3019# 3019#
3020# USB HID Boot Protocol drivers
3021#
3022# CONFIG_USB_KBD is not set
3023# CONFIG_USB_MOUSE is not set
3024
3025#
3026# Special HID drivers 3020# Special HID drivers
3027# 3021#
3028CONFIG_HID_A4TECH=m 3022CONFIG_HID_A4TECH=m
@@ -3915,7 +3909,7 @@ CONFIG_MSDOS_PARTITION=y
3915CONFIG_BSD_DISKLABEL=y 3909CONFIG_BSD_DISKLABEL=y
3916CONFIG_MINIX_SUBPARTITION=y 3910CONFIG_MINIX_SUBPARTITION=y
3917CONFIG_SOLARIS_X86_PARTITION=y 3911CONFIG_SOLARIS_X86_PARTITION=y
3918CONFIG_UNIXWARE_DISKLABEL=y 3912# CONFIG_UNIXWARE_DISKLABEL is not set
3919CONFIG_LDM_PARTITION=y 3913CONFIG_LDM_PARTITION=y
3920# CONFIG_LDM_DEBUG is not set 3914# CONFIG_LDM_DEBUG is not set
3921CONFIG_SGI_PARTITION=y 3915CONFIG_SGI_PARTITION=y