diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-02-28 07:23:22 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-02-28 07:23:27 -0500 |
| commit | e135e4506c6d3e9b196890877a9a2815f71b04ac (patch) | |
| tree | b4f36fdb126eb35a9c7a5632ad1b628bbf11971d /arch/arm/Kconfig.debug | |
| parent | ee80285e1b79e6a7a6855c8be65bddc61f4d69be (diff) | |
| parent | 1aa0cf677949dafaaff8cd1a78f1f69a239138ac (diff) | |
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 b895a2a92da..66ca8014ff3 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug | |||
| @@ -180,12 +180,12 @@ choice | |||
| 180 | Say Y here if you want kernel low-level debugging support | 180 | Say Y here if you want kernel low-level debugging support |
| 181 | on i.MX50 or i.MX53. | 181 | on i.MX50 or i.MX53. |
| 182 | 182 | ||
| 183 | config DEBUG_IMX6Q_UART | 183 | config DEBUG_IMX6Q_UART4 |
| 184 | bool "i.MX6Q Debug UART" | 184 | bool "i.MX6Q Debug UART4" |
| 185 | depends on SOC_IMX6Q | 185 | depends on SOC_IMX6Q |
| 186 | help | 186 | help |
| 187 | Say Y here if you want kernel low-level debugging support | 187 | Say Y here if you want kernel low-level debugging support |
| 188 | on i.MX6Q. | 188 | on i.MX6Q UART4. |
| 189 | 189 | ||
| 190 | config DEBUG_MSM_UART1 | 190 | config DEBUG_MSM_UART1 |
| 191 | bool "Kernel low-level debugging messages via MSM UART1" | 191 | bool "Kernel low-level debugging messages via MSM UART1" |