diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 09:29:20 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 09:29:43 -0400 |
| commit | 44c0d2377539fafd1023ec7e16765b71c7f4fbce (patch) | |
| tree | 49065c2af83c723f150bf636939790ad3108a897 /arch/arm/Kconfig.debug | |
| parent | 8024206dbf4e0701f0cdf259a122ea23db3a7a16 (diff) | |
| parent | 07961ac7c0ee8b546658717034fe692fd12eefa9 (diff) | |
Merge tag 'v3.9-rc5' into next/cleanup
This is a dependency for the mxs/cleanup branch.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/Kconfig.debug')
| -rw-r--r-- | arch/arm/Kconfig.debug | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index ecfcdba2d17c..9b31f4311ea2 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug | |||
| @@ -495,6 +495,7 @@ config DEBUG_IMX_UART_PORT | |||
| 495 | DEBUG_IMX53_UART || \ | 495 | DEBUG_IMX53_UART || \ |
| 496 | DEBUG_IMX6Q_UART | 496 | DEBUG_IMX6Q_UART |
| 497 | default 1 | 497 | default 1 |
| 498 | depends on ARCH_MXC | ||
| 498 | help | 499 | help |
| 499 | Choose UART port on which kernel low-level debug messages | 500 | Choose UART port on which kernel low-level debug messages |
| 500 | should be output. | 501 | should be output. |