Merge tag 'mvebu-soc-3.17-2' of git://git.infradead.org/linux-mvebu into next/soc

Merge "ARM: mvebu SoC changes for v3.17 (round 2)" from Jason Cooper:

"Yeah, it's just one patch, but it's a beautiful one!  Thanks to the
efforts of many people over the last couple years, and in particular,
Andrew Lunn, Kirkwood has been completely converted to DT."

 - kirkwood
   * Remove mach-kirkwood/, It's fully supported in mach-mvebu/

* tag 'mvebu-soc-3.17-2' of git://git.infradead.org/linux-mvebu:
  ARM: Kirkwood: Remove mach-kirkwood

Signed-off-by: Olof Johansson <olof@lixom.net>

1 files changed, 2 insertions, 3 deletions

diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index 3548612b0bfe..35ba55bce827 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -1041,7 +1041,7 @@ config DEBUG_UART_8250
         def_bool ARCH_DOVE || ARCH_EBSA110 || \
                 (FOOTBRIDGE && !DEBUG_DC21285_PORT) || \
                 ARCH_GEMINI || ARCH_IOP13XX || ARCH_IOP32X || \
-                ARCH_IOP33X || ARCH_IXP4XX || ARCH_KIRKWOOD || \
+                ARCH_IOP33X || ARCH_IXP4XX || \
                 ARCH_LPC32XX || ARCH_MV78XX0 || ARCH_ORION5X || ARCH_RPC
 
 config DEBUG_UART_PHYS
@@ -1098,7 +1098,7 @@ config DEBUG_UART_PHYS
         default 0xe0000000 if ARCH_SPEAR13XX
         default 0xf0000be0 if ARCH_EBSA110
         default 0xf1012000 if DEBUG_MVEBU_UART_ALTERNATE
-        default 0xf1012000 if ARCH_DOVE || ARCH_KIRKWOOD || ARCH_MV78XX0 || \
+        default 0xf1012000 if ARCH_DOVE || ARCH_MV78XX0 || \
                                 ARCH_ORION5X
         default 0xf7fc9000 if DEBUG_BERLIN_UART
         default 0xf8b00000 if DEBUG_HI3716_UART
@@ -1164,7 +1164,6 @@ config DEBUG_UART_VIRT
         default 0xfec20000 if DEBUG_DAVINCI_DMx_UART0
         default 0xfed0c000 if DEBUG_DAVINCI_DA8XX_UART1
         default 0xfed0d000 if DEBUG_DAVINCI_DA8XX_UART2
-        default 0xfed12000 if ARCH_KIRKWOOD
         default 0xfed60000 if DEBUG_RK29_UART0
         default 0xfed64000 if DEBUG_RK29_UART1 || DEBUG_RK3X_UART2
         default 0xfed68000 if DEBUG_RK29_UART2 || DEBUG_RK3X_UART3