Merge branch 'prcm_scm_misc_fixes_3.2' of git://git.pwsan.com/linux-2.6 into fixes

[pandora-kernel.git] / arch / arm / Kconfig.debug

diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index a1cb484..c5213e7 100644 (file)
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -128,6 +128,13 @@ choice
                  Say Y here if you want the debug print routines to direct
                  their output to the second serial port on these devices.
 
+       config DEBUG_HIGHBANK_UART
+               bool "Kernel low-level debugging messages via Highbank UART"
+               depends on ARCH_HIGHBANK
+               help
+                 Say Y here if you want the debug print routines to direct
+                 their output to the UART on Highbank based devices.
+
        config DEBUG_IMX1_UART
                bool "i.MX1 Debug UART"
                depends on SOC_IMX1
@@ -252,7 +259,7 @@ config EARLY_PRINTK
 
 config OC_ETM
        bool "On-chip ETM and ETB"
-       select ARM_AMBA
+       depends on ARM_AMBA
        help
          Enables the on-chip embedded trace macrocell and embedded trace
          buffer driver that will allow you to collect traces of the