Merge tag 'v4.0-rc1' into locking/core, to refresh the tree before merging new changes

[deliverable/linux.git] / arch / arm / configs / iop33x_defconfig

diff --git a/arch/arm/configs/iop33x_defconfig b/arch/arm/configs/iop33x_defconfig
index aa36128abca243fce01fce039ad580b31ae2d5fb..713faeee8cf4f398497fc71c7e0d46443ca4656b 100644 (file)
--- a/arch/arm/configs/iop33x_defconfig
+++ b/arch/arm/configs/iop33x_defconfig
@@ -87,5 +87,6 @@ CONFIG_DEBUG_KERNEL=y
 # CONFIG_RCU_CPU_STALL_DETECTOR is not set
 CONFIG_DEBUG_USER=y
 CONFIG_DEBUG_LL=y
+CONFIG_DEBUG_LL_UART_8250=y
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
 # CONFIG_CRC32 is not set