summaryrefslogtreecommitdiff
path: root/arch/arm/configs/mxs_defconfig
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2016-06-14 16:11:05 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2016-06-14 16:11:05 +1000
commitf3f2336baff1f26cedda95895d00a169a1a90df0 (patch)
tree9cc6c60d86a87c481666f902b77f1bd694dec9d9 /arch/arm/configs/mxs_defconfig
parent4c6c5d838428d9c649c8ee37795e99c4d2722299 (diff)
parent8e2bc198f1d469b814bc804e8b3327f3abcb678f (diff)
downloadlinux-next-f3f2336baff1f26cedda95895d00a169a1a90df0.tar.gz
Merge branch 'akpm-current/current'
Diffstat (limited to 'arch/arm/configs/mxs_defconfig')
-rw-r--r--arch/arm/configs/mxs_defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/mxs_defconfig b/arch/arm/configs/mxs_defconfig
index 6e0f751be229..8a3d2f21c18f 100644
--- a/arch/arm/configs/mxs_defconfig
+++ b/arch/arm/configs/mxs_defconfig
@@ -166,7 +166,7 @@ CONFIG_NLS_CODEPAGE_437=y
CONFIG_NLS_CODEPAGE_850=y
CONFIG_NLS_ISO8859_1=y
CONFIG_NLS_ISO8859_15=y
-CONFIG_PRINTK_TIME=y
+CONFIG_PRINTK_TIME=1
CONFIG_DEBUG_INFO=y
CONFIG_FRAME_WARN=2048
CONFIG_UNUSED_SYMBOLS=y