diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-02-28 13:23:22 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-02-28 13:23:27 +0100 |
| commit | e135e4506c6d3e9b196890877a9a2815f71b04ac (patch) | |
| tree | b4f36fdb126eb35a9c7a5632ad1b628bbf11971d /arch/arm/Kconfig.debug | |
| parent | Merge branch 'mxs/gpmi' of git://git.linaro.org/people/shawnguo/linux-2.6 int... (diff) | |
| parent | ARM: imx6q: add cko1 clock (diff) | |
| download | linux-e135e4506c6d3e9b196890877a9a2815f71b04ac.tar.xz linux-e135e4506c6d3e9b196890877a9a2815f71b04ac.zip | |
Merge branch 'imx/driver' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/drivers
* 'imx/driver' of git://git.linaro.org/people/shawnguo/linux-2.6: (3 commits)
ARM: imx6q: add cko1 clock
ARM: mxc: make imx_dma_is_general_purpose more generic for sdma
ARM: imx6: Rename DEBUG_IMX6Q_UART to UART4
Diffstat (limited to 'arch/arm/Kconfig.debug')
| -rw-r--r-- | arch/arm/Kconfig.debug | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index b895a2a92da8..66ca8014ff3e 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -180,12 +180,12 @@ choice Say Y here if you want kernel low-level debugging support on i.MX50 or i.MX53. - config DEBUG_IMX6Q_UART - bool "i.MX6Q Debug UART" + config DEBUG_IMX6Q_UART4 + bool "i.MX6Q Debug UART4" depends on SOC_IMX6Q help Say Y here if you want kernel low-level debugging support - on i.MX6Q. + on i.MX6Q UART4. config DEBUG_MSM_UART1 bool "Kernel low-level debugging messages via MSM UART1" |