diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-08-03 05:07:44 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-08-03 05:07:57 -0400 |
| commit | 7a376ac11fc2109dfd86442ff79982ecf16dcd6d (patch) | |
| tree | c2b54ce3df28df599d30384e879d16d36bbb15bd | |
| parent | 869ec056fa8450184423c8076e0a342db127795c (diff) | |
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
| -rw-r--r-- | arch/arm/configs/aspeed_g4_defconfig | 2 | ||||
| -rw-r--r-- | arch/arm/configs/aspeed_g5_defconfig | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/configs/aspeed_g4_defconfig b/arch/arm/configs/aspeed_g4_defconfig index b6e54ee9bdbd..ca39c04fec6b 100644 --- a/arch/arm/configs/aspeed_g4_defconfig +++ b/arch/arm/configs/aspeed_g4_defconfig | |||
| @@ -58,7 +58,7 @@ CONFIG_SERIAL_OF_PLATFORM=y | |||
| 58 | # CONFIG_IOMMU_SUPPORT is not set | 58 | # CONFIG_IOMMU_SUPPORT is not set |
| 59 | CONFIG_FIRMWARE_MEMMAP=y | 59 | CONFIG_FIRMWARE_MEMMAP=y |
| 60 | CONFIG_FANOTIFY=y | 60 | CONFIG_FANOTIFY=y |
| 61 | CONFIG_PRINTK_TIME=1 | 61 | CONFIG_PRINTK_TIME=y |
| 62 | CONFIG_DYNAMIC_DEBUG=y | 62 | CONFIG_DYNAMIC_DEBUG=y |
| 63 | CONFIG_STRIP_ASM_SYMS=y | 63 | CONFIG_STRIP_ASM_SYMS=y |
| 64 | CONFIG_PAGE_POISONING=y | 64 | CONFIG_PAGE_POISONING=y |
diff --git a/arch/arm/configs/aspeed_g5_defconfig b/arch/arm/configs/aspeed_g5_defconfig index 892605167357..4f366b0370e9 100644 --- a/arch/arm/configs/aspeed_g5_defconfig +++ b/arch/arm/configs/aspeed_g5_defconfig | |||
| @@ -59,7 +59,7 @@ CONFIG_SERIAL_OF_PLATFORM=y | |||
| 59 | # CONFIG_IOMMU_SUPPORT is not set | 59 | # CONFIG_IOMMU_SUPPORT is not set |
| 60 | CONFIG_FIRMWARE_MEMMAP=y | 60 | CONFIG_FIRMWARE_MEMMAP=y |
| 61 | CONFIG_FANOTIFY=y | 61 | CONFIG_FANOTIFY=y |
| 62 | CONFIG_PRINTK_TIME=1 | 62 | CONFIG_PRINTK_TIME=y |
| 63 | CONFIG_DYNAMIC_DEBUG=y | 63 | CONFIG_DYNAMIC_DEBUG=y |
| 64 | CONFIG_STRIP_ASM_SYMS=y | 64 | CONFIG_STRIP_ASM_SYMS=y |
| 65 | CONFIG_PAGE_POISONING=y | 65 | CONFIG_PAGE_POISONING=y |