Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Revert "ARM: aspeed: adapt defconfigs for new CONFIG_PRINTK_TIME"

The patch that this was preparing for made it into neither v4.7 nor
v4.8, so we should back this out as well to avoid the opposite
warning:

arch/arm/configs/aspeed_g5_defconfig:62:warning: symbol value '1' invalid for PRINTK_TIME
arch/arm/configs/aspeed_g4_defconfig:61:warning: symbol value '1' invalid for PRINTK_TIME

Sorry for not catching this earlier.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: 0ef659a30055 ("ARM: aspeed: adapt defconfigs for new CONFIG_PRINTK_TIME")
Cc: stable@vger.kernel.org # v4.7

+2 -2
+1 -1
arch/arm/configs/aspeed_g4_defconfig
··· 58 58 # CONFIG_IOMMU_SUPPORT is not set 59 59 CONFIG_FIRMWARE_MEMMAP=y 60 60 CONFIG_FANOTIFY=y 61 - CONFIG_PRINTK_TIME=1 61 + CONFIG_PRINTK_TIME=y 62 62 CONFIG_DYNAMIC_DEBUG=y 63 63 CONFIG_STRIP_ASM_SYMS=y 64 64 CONFIG_PAGE_POISONING=y
+1 -1
arch/arm/configs/aspeed_g5_defconfig
··· 59 59 # CONFIG_IOMMU_SUPPORT is not set 60 60 CONFIG_FIRMWARE_MEMMAP=y 61 61 CONFIG_FANOTIFY=y 62 - CONFIG_PRINTK_TIME=1 62 + CONFIG_PRINTK_TIME=y 63 63 CONFIG_DYNAMIC_DEBUG=y 64 64 CONFIG_STRIP_ASM_SYMS=y 65 65 CONFIG_PAGE_POISONING=y