diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-03-21 12:39:59 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-03-21 12:40:07 -0400 |
| commit | a8d03eb42b8d071696494c1cb23a2c16e5219059 (patch) | |
| tree | 3e05a928903d31b8a276fa6cf8e1f1d269209dbe | |
| parent | a4ba740d4179f95aa6c95ce7c935d3bf451c6381 (diff) | |
| parent | 287939a3690c8da6fd3310d7593ff0448cb9447c (diff) | |
Merge tag 'imx-fixes-3.9-3' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes
From Shawn Guo <shawn.guo@linaro.org>:
The imx fixes for 3.9, take 3:
- Add the lost dependency check for DEBUG_IMX_UART_PORT back
* tag 'imx-fixes-3.9-3' of git://git.linaro.org/people/shawnguo/linux-2.6:
ARM: imx: add dependency check for DEBUG_IMX_UART_PORT
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| -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. |