Commit Graph

3 Commits

Author SHA1 Message Date
Arnd Bergmann 7a376ac11f 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: 0ef659a300 ("ARM: aspeed: adapt defconfigs for new CONFIG_PRINTK_TIME")
Cc: stable@vger.kernel.org # v4.7
2016-08-03 11:07:57 +02:00
Arnd Bergmann 0ef659a300 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 d0bc3483da ("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>
2016-05-11 14:11:13 +02:00
Joel Stanley d0bc3483da arm/configs: Add Aspeed defconfig
Signed-off-by: Joel Stanley <joel@jms.id.au>
2016-05-09 19:12:30 +09:30