Skip to content

Commit 0ef659a

Browse files
committed
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 d0bc348 ("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 <[email protected]>
1 parent b80dc59 commit 0ef659a

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

arch/arm/configs/aspeed_g4_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ CONFIG_SERIAL_OF_PLATFORM=y
5858
# CONFIG_IOMMU_SUPPORT is not set
5959
CONFIG_FIRMWARE_MEMMAP=y
6060
CONFIG_FANOTIFY=y
61-
CONFIG_PRINTK_TIME=y
61+
CONFIG_PRINTK_TIME=1
6262
CONFIG_DYNAMIC_DEBUG=y
6363
CONFIG_STRIP_ASM_SYMS=y
6464
CONFIG_PAGE_POISONING=y

arch/arm/configs/aspeed_g5_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ CONFIG_SERIAL_OF_PLATFORM=y
5959
# CONFIG_IOMMU_SUPPORT is not set
6060
CONFIG_FIRMWARE_MEMMAP=y
6161
CONFIG_FANOTIFY=y
62-
CONFIG_PRINTK_TIME=y
62+
CONFIG_PRINTK_TIME=1
6363
CONFIG_DYNAMIC_DEBUG=y
6464
CONFIG_STRIP_ASM_SYMS=y
6565
CONFIG_PAGE_POISONING=y

0 commit comments

Comments
 (0)