diff options
| -rw-r--r-- | arch/arm/configs/mxs_defconfig | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/arch/arm/configs/mxs_defconfig b/arch/arm/configs/mxs_defconfig index 7b8212857535..2119a6ac8455 100644 --- a/arch/arm/configs/mxs_defconfig +++ b/arch/arm/configs/mxs_defconfig | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | CONFIG_SYSVIPC=y | 1 | CONFIG_SYSVIPC=y |
| 2 | CONFIG_NO_HZ=y | 2 | CONFIG_NO_HZ=y |
| 3 | CONFIG_HIGH_RES_TIMERS=y | 3 | CONFIG_HIGH_RES_TIMERS=y |
| 4 | CONFIG_PREEMPT_VOLUNTARY=y | ||
| 4 | CONFIG_TASKSTATS=y | 5 | CONFIG_TASKSTATS=y |
| 5 | CONFIG_TASK_DELAY_ACCT=y | 6 | CONFIG_TASK_DELAY_ACCT=y |
| 6 | CONFIG_TASK_XACCT=y | 7 | CONFIG_TASK_XACCT=y |
| @@ -15,6 +16,10 @@ CONFIG_CGROUPS=y | |||
| 15 | CONFIG_BLK_DEV_INITRD=y | 16 | CONFIG_BLK_DEV_INITRD=y |
| 16 | CONFIG_PERF_EVENTS=y | 17 | CONFIG_PERF_EVENTS=y |
| 17 | # CONFIG_COMPAT_BRK is not set | 18 | # CONFIG_COMPAT_BRK is not set |
| 19 | # CONFIG_ARCH_MULTI_V7 is not set | ||
| 20 | CONFIG_ARCH_MXS=y | ||
| 21 | # CONFIG_ARM_THUMB is not set | ||
| 22 | CONFIG_AEABI=y | ||
| 18 | CONFIG_MODULES=y | 23 | CONFIG_MODULES=y |
| 19 | CONFIG_MODULE_FORCE_LOAD=y | 24 | CONFIG_MODULE_FORCE_LOAD=y |
| 20 | CONFIG_MODULE_UNLOAD=y | 25 | CONFIG_MODULE_UNLOAD=y |
| @@ -23,11 +28,6 @@ CONFIG_MODVERSIONS=y | |||
| 23 | CONFIG_BLK_DEV_INTEGRITY=y | 28 | CONFIG_BLK_DEV_INTEGRITY=y |
| 24 | # CONFIG_IOSCHED_DEADLINE is not set | 29 | # CONFIG_IOSCHED_DEADLINE is not set |
| 25 | # CONFIG_IOSCHED_CFQ is not set | 30 | # CONFIG_IOSCHED_CFQ is not set |
| 26 | # CONFIG_ARCH_MULTI_V7 is not set | ||
| 27 | CONFIG_ARCH_MXS=y | ||
| 28 | # CONFIG_ARM_THUMB is not set | ||
| 29 | CONFIG_PREEMPT_VOLUNTARY=y | ||
| 30 | CONFIG_AEABI=y | ||
| 31 | CONFIG_NET=y | 31 | CONFIG_NET=y |
| 32 | CONFIG_PACKET=y | 32 | CONFIG_PACKET=y |
| 33 | CONFIG_UNIX=y | 33 | CONFIG_UNIX=y |
| @@ -163,6 +163,10 @@ CONFIG_NLS_CODEPAGE_437=y | |||
| 163 | CONFIG_NLS_CODEPAGE_850=y | 163 | CONFIG_NLS_CODEPAGE_850=y |
| 164 | CONFIG_NLS_ISO8859_1=y | 164 | CONFIG_NLS_ISO8859_1=y |
| 165 | CONFIG_NLS_ISO8859_15=y | 165 | CONFIG_NLS_ISO8859_15=y |
| 166 | CONFIG_CRYPTO_DEV_MXS_DCP=y | ||
| 167 | CONFIG_CRC_ITU_T=m | ||
| 168 | CONFIG_CRC7=m | ||
| 169 | CONFIG_FONTS=y | ||
| 166 | CONFIG_PRINTK_TIME=y | 170 | CONFIG_PRINTK_TIME=y |
| 167 | CONFIG_DEBUG_INFO=y | 171 | CONFIG_DEBUG_INFO=y |
| 168 | CONFIG_FRAME_WARN=2048 | 172 | CONFIG_FRAME_WARN=2048 |
| @@ -174,7 +178,3 @@ CONFIG_PROVE_LOCKING=y | |||
| 174 | CONFIG_BLK_DEV_IO_TRACE=y | 178 | CONFIG_BLK_DEV_IO_TRACE=y |
| 175 | CONFIG_STRICT_DEVMEM=y | 179 | CONFIG_STRICT_DEVMEM=y |
| 176 | CONFIG_DEBUG_USER=y | 180 | CONFIG_DEBUG_USER=y |
| 177 | CONFIG_CRYPTO_DEV_MXS_DCP=y | ||
| 178 | CONFIG_CRC_ITU_T=m | ||
| 179 | CONFIG_CRC7=m | ||
| 180 | CONFIG_FONTS=y | ||
