Merge branch 'master' into for-next

Fast-forwarded to current state of Linus' tree as there are patches to be
applied for files that didn't exist on the old branch.

1 files changed, 4 insertions, 4 deletions

diff --git a/arch/mn10300/kernel/gdb-io-ttysm.c b/arch/mn10300/kernel/gdb-io-ttysm.c
index abdeea153c89..c859cacbb9c3 100644
--- a/arch/mn10300/kernel/gdb-io-ttysm.c
+++ b/arch/mn10300/kernel/gdb-io-ttysm.c
@@ -59,10 +59,10 @@ void __init gdbstub_io_init(void)
 
         /* we want to get serial receive interrupts */
         set_intr_level(gdbstub_port->rx_irq,
-                NUM2GxICR_LEVEL(CONFIG_GDBSTUB_IRQ_LEVEL));
+                NUM2GxICR_LEVEL(CONFIG_DEBUGGER_IRQ_LEVEL));
         set_intr_level(gdbstub_port->tx_irq,
-                NUM2GxICR_LEVEL(CONFIG_GDBSTUB_IRQ_LEVEL));
-        set_intr_stub(NUM2EXCEP_IRQ_LEVEL(CONFIG_GDBSTUB_IRQ_LEVEL),
+                NUM2GxICR_LEVEL(CONFIG_DEBUGGER_IRQ_LEVEL));
+        set_intr_stub(NUM2EXCEP_IRQ_LEVEL(CONFIG_DEBUGGER_IRQ_LEVEL),
                 gdbstub_io_rx_handler);
 
         *gdbstub_port->rx_icr |= GxICR_ENABLE;
@@ -88,7 +88,7 @@ void __init gdbstub_io_init(void)
 
         /* permit level 0 IRQs only */
         arch_local_change_intr_mask_level(
-                NUM2EPSW_IM(CONFIG_GDBSTUB_IRQ_LEVEL + 1));
+                NUM2EPSW_IM(CONFIG_DEBUGGER_IRQ_LEVEL + 1));
 }
 
 /*