Merge branch 'kvm-updates/3.4' of git://git.kernel.org/pub/scm/virt/kvm/kvm
[cascardo/linux.git] / arch / arm / Kconfig.debug
index 03646c4..66ca801 100644 (file)
@@ -86,7 +86,7 @@ choice
                depends on HAVE_AT91_DBGU0
 
        config AT91_DEBUG_LL_DBGU1
-               bool "Kernel low-level debugging on 9263, 9g45 and cap9"
+               bool "Kernel low-level debugging on 9263 and 9g45"
                depends on HAVE_AT91_DBGU1
 
        config DEBUG_CLPS711X_UART1
@@ -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"