diff options
Diffstat (limited to 'arch/arm/configs/ams_delta_defconfig')
-rw-r--r-- | arch/arm/configs/ams_delta_defconfig | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/arm/configs/ams_delta_defconfig b/arch/arm/configs/ams_delta_defconfig index 3b3a3775bbf4..6d8a0c891f80 100644 --- a/arch/arm/configs/ams_delta_defconfig +++ b/arch/arm/configs/ams_delta_defconfig | |||
@@ -47,6 +47,7 @@ CONFIG_SYSVIPC_SYSCTL=y | |||
47 | # CONFIG_TASKSTATS is not set | 47 | # CONFIG_TASKSTATS is not set |
48 | # CONFIG_UTS_NS is not set | 48 | # CONFIG_UTS_NS is not set |
49 | # CONFIG_AUDIT is not set | 49 | # CONFIG_AUDIT is not set |
50 | CONFIG_TREE_PREEMPT_RCU=y | ||
50 | # CONFIG_IKCONFIG is not set | 51 | # CONFIG_IKCONFIG is not set |
51 | CONFIG_LOG_BUF_SHIFT=14 | 52 | CONFIG_LOG_BUF_SHIFT=14 |
52 | CONFIG_SYSFS_DEPRECATED=y | 53 | CONFIG_SYSFS_DEPRECATED=y |
@@ -95,9 +96,8 @@ CONFIG_KMOD=y | |||
95 | # Block layer | 96 | # Block layer |
96 | # | 97 | # |
97 | CONFIG_BLOCK=y | 98 | CONFIG_BLOCK=y |
98 | # CONFIG_LBD is not set | 99 | # CONFIG_LBDAF is not set |
99 | # CONFIG_BLK_DEV_IO_TRACE is not set | 100 | # CONFIG_BLK_DEV_IO_TRACE is not set |
100 | # CONFIG_LSF is not set | ||
101 | 101 | ||
102 | # | 102 | # |
103 | # IO Schedulers | 103 | # IO Schedulers |
@@ -699,6 +699,7 @@ CONFIG_SERIO=y | |||
699 | CONFIG_SERIO_SERPORT=y | 699 | CONFIG_SERIO_SERPORT=y |
700 | CONFIG_SERIO_LIBPS2=y | 700 | CONFIG_SERIO_LIBPS2=y |
701 | # CONFIG_SERIO_RAW is not set | 701 | # CONFIG_SERIO_RAW is not set |
702 | CONFIG_SERIO_AMS_DELTA=y | ||
702 | # CONFIG_GAMEPORT is not set | 703 | # CONFIG_GAMEPORT is not set |
703 | 704 | ||
704 | # | 705 | # |
@@ -835,7 +836,8 @@ CONFIG_DAB=y | |||
835 | # | 836 | # |
836 | # Graphics support | 837 | # Graphics support |
837 | # | 838 | # |
838 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 839 | CONFIG_BACKLIGHT_LCD_SUPPORT=y |
840 | CONFIG_LCD_CLASS_DEVICE=y | ||
839 | 841 | ||
840 | # | 842 | # |
841 | # Display device support | 843 | # Display device support |
@@ -1283,7 +1285,7 @@ CONFIG_DEBUG_PREEMPT=y | |||
1283 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1285 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
1284 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 1286 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
1285 | # CONFIG_DEBUG_KOBJECT is not set | 1287 | # CONFIG_DEBUG_KOBJECT is not set |
1286 | CONFIG_DEBUG_BUGVERBOSE=y | 1288 | # CONFIG_DEBUG_BUGVERBOSE is not set |
1287 | # CONFIG_DEBUG_INFO is not set | 1289 | # CONFIG_DEBUG_INFO is not set |
1288 | # CONFIG_DEBUG_VM is not set | 1290 | # CONFIG_DEBUG_VM is not set |
1289 | # CONFIG_DEBUG_LIST is not set | 1291 | # CONFIG_DEBUG_LIST is not set |