Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-microblaze.git] / arch / arm / Kconfig.debug

diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index 8986a91..4ff0420 100644 (file)
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -1567,7 +1567,7 @@ config DEBUG_SIRFSOC_UART
 config DEBUG_UART_FLOW_CONTROL
        bool "Enable flow control (CTS) for the debug UART"
        depends on DEBUG_LL
 config DEBUG_UART_FLOW_CONTROL
        bool "Enable flow control (CTS) for the debug UART"
        depends on DEBUG_LL

-       default y if ARCH_EBSA110 || DEBUG_FOOTBRIDGE_COM1 || DEBUG_GEMINI || ARCH_RPC
+       default y if DEBUG_FOOTBRIDGE_COM1 || DEBUG_GEMINI || ARCH_RPC

        help
          Some UART ports are connected to terminals that will use modem
          control signals to indicate whether they are ready to receive text.
        help
          Some UART ports are connected to terminals that will use modem
          control signals to indicate whether they are ready to receive text.


@@ -1639,7 +1639,7 @@ config DEBUG_UART_PL01X
 
 # Compatibility options for 8250
 config DEBUG_UART_8250
 
 # Compatibility options for 8250
 config DEBUG_UART_8250

-       def_bool ARCH_EBSA110 || ARCH_IOP32X || ARCH_IXP4XX || ARCH_RPC
+       def_bool ARCH_IOP32X || ARCH_IXP4XX || ARCH_RPC

 
 config DEBUG_UART_PHYS
        hex "Physical base address of debug UART"
 
 config DEBUG_UART_PHYS
        hex "Physical base address of debug UART"


@@ -1743,7 +1743,6 @@ config DEBUG_UART_PHYS
        default 0xe8008000 if DEBUG_R7S72100_SCIF2 || DEBUG_R7S9210_SCIF2
        default 0xe8009000 if DEBUG_R7S9210_SCIF4
        default 0xf0000000 if DEBUG_DIGICOLOR_UA0
        default 0xe8008000 if DEBUG_R7S72100_SCIF2 || DEBUG_R7S9210_SCIF2
        default 0xe8009000 if DEBUG_R7S9210_SCIF4
        default 0xf0000000 if DEBUG_DIGICOLOR_UA0

-       default 0xf0000be0 if ARCH_EBSA110

        default 0xf1012000 if DEBUG_MVEBU_UART0_ALTERNATE
        default 0xf1012100 if DEBUG_MVEBU_UART1_ALTERNATE
        default 0xf7fc9000 if DEBUG_BERLIN_UART
        default 0xf1012000 if DEBUG_MVEBU_UART0_ALTERNATE
        default 0xf1012100 if DEBUG_MVEBU_UART1_ALTERNATE
        default 0xf7fc9000 if DEBUG_BERLIN_UART


@@ -1790,7 +1789,6 @@ config DEBUG_UART_VIRT
        default 0xc8821000 if DEBUG_RV1108_UART1
        default 0xc8912000 if DEBUG_RV1108_UART0
        default 0xe0010fe0 if ARCH_RPC
        default 0xc8821000 if DEBUG_RV1108_UART1
        default 0xc8912000 if DEBUG_RV1108_UART0
        default 0xe0010fe0 if ARCH_RPC

-       default 0xf0000be0 if ARCH_EBSA110

        default 0xf0010000 if DEBUG_ASM9260_UART
        default 0xf0100000 if DEBUG_DIGICOLOR_UA0
        default 0xf01fb000 if DEBUG_NOMADIK_UART
        default 0xf0010000 if DEBUG_ASM9260_UART
        default 0xf0100000 if DEBUG_DIGICOLOR_UA0
        default 0xf01fb000 if DEBUG_NOMADIK_UART