diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 09:57:27 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 10:02:14 -0400 |
| commit | 71f6424023cb9fa381efc7237ca05926b2b1ca9a (patch) | |
| tree | 6c3c4a2110d0ff3d73c4bacaddb23b9295663695 /arch/arm/Kconfig.debug | |
| parent | 9bc128e16bb82c046d6972171de572affc5c4cbf (diff) | |
| parent | e933a1a12a02f42e0013cda87bba37ccb59efc47 (diff) | |
Merge branch 'mxs/cleanup' into next/multiplatform
This is a dependency for mxs/multiplatform
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Conflicts:
drivers/clocksource/Makefile
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 719ef2855b8e..edb496b656b1 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug | |||
| @@ -520,6 +520,7 @@ config DEBUG_IMX_UART_PORT | |||
| 520 | DEBUG_IMX53_UART || \ | 520 | DEBUG_IMX53_UART || \ |
| 521 | DEBUG_IMX6Q_UART | 521 | DEBUG_IMX6Q_UART |
| 522 | default 1 | 522 | default 1 |
| 523 | depends on ARCH_MXC | ||
| 523 | help | 524 | help |
| 524 | Choose UART port on which kernel low-level debug messages | 525 | Choose UART port on which kernel low-level debug messages |
| 525 | should be output. | 526 | should be output. |