summaryrefslogtreecommitdiff
path: root/arch/arm/configs/aspeed_g4_defconfig
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2016-05-11 14:11:13 +0200
committerArnd Bergmann <arnd@arndb.de>2016-05-11 14:11:13 +0200
commit0ef659a30055e5ec914b51f5294789ea2a92b08c (patch)
treeaff4d698c7f1cdd9fa8363e862d3385b194e21e7 /arch/arm/configs/aspeed_g4_defconfig
parentb80dc598eb997bf8a7942fa0cedc1e02001825f7 (diff)
ARM: aspeed: adapt defconfigs for new CONFIG_PRINTK_TIME
Commit 94ea9c7a579f ("lib, switch CONFIG_PRINTK_TIME to int") changes the type of CONFIG_PRINTK_TIME and adapts all existing defconfig files, while we add two new defconfig files with d0bc3483da87 ("arm/configs: Add Aspeed defconfig"), with the old type. This changes the two new defconfig files to match the other ones. As a result, we get harmless warnings for the arm-soc defconfig branch by itself, but everything will work when 4.7-rc1 is out. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/configs/aspeed_g4_defconfig')
-rw-r--r--arch/arm/configs/aspeed_g4_defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/aspeed_g4_defconfig b/arch/arm/configs/aspeed_g4_defconfig
index ca39c04fec6b..b6e54ee9bdbd 100644
--- a/arch/arm/configs/aspeed_g4_defconfig
+++ b/arch/arm/configs/aspeed_g4_defconfig
@@ -58,7 +58,7 @@ CONFIG_SERIAL_OF_PLATFORM=y
# CONFIG_IOMMU_SUPPORT is not set
CONFIG_FIRMWARE_MEMMAP=y
CONFIG_FANOTIFY=y
-CONFIG_PRINTK_TIME=y
+CONFIG_PRINTK_TIME=1
CONFIG_DYNAMIC_DEBUG=y
CONFIG_STRIP_ASM_SYMS=y
CONFIG_PAGE_POISONING=y