1 files changed, 6 insertions, 6 deletions

diff --git a/arch/mips/sibyte/bcm1480/irq.c b/arch/mips/sibyte/bcm1480/irq.c
index ba0c4b776c85..e729b5f30264 100644
--- a/arch/mips/sibyte/bcm1480/irq.c
+++ b/arch/mips/sibyte/bcm1480/irq.c
@@ -76,7 +76,7 @@ __setup("nokgdb", nokgdb);
 
 /* Default to UART1 */
 int kgdb_port = 1;
-#ifdef CONFIG_SIBYTE_SB1250_DUART
+#ifdef CONFIG_SERIAL_SB1250_DUART
 extern char sb1250_duart_present[];
 #endif
 #endif
@@ -100,8 +100,8 @@ DEFINE_SPINLOCK(bcm1480_imr_lock);
 
 void bcm1480_mask_irq(int cpu, int irq)
 {
-        unsigned long flags;
-        u64 cur_ints,hl_spacing;
+        unsigned long flags, hl_spacing;
+        u64 cur_ints;
 
         spin_lock_irqsave(&bcm1480_imr_lock, flags);
         hl_spacing = 0;
@@ -117,8 +117,8 @@ void bcm1480_mask_irq(int cpu, int irq)
 
 void bcm1480_unmask_irq(int cpu, int irq)
 {
-        unsigned long flags;
-        u64 cur_ints,hl_spacing;
+        unsigned long flags, hl_spacing;
+        u64 cur_ints;
 
         spin_lock_irqsave(&bcm1480_imr_lock, flags);
         hl_spacing = 0;
@@ -404,7 +404,7 @@ void __init arch_init_irq(void)
         if (kgdb_flag) {
                 kgdb_irq = K_BCM1480_INT_UART_0 + kgdb_port;
 
-#ifdef CONFIG_SIBYTE_SB1250_DUART
+#ifdef CONFIG_SERIAL_SB1250_DUART
                 sb1250_duart_present[kgdb_port] = 0;
 #endif
                 /* Setup uart 1 settings, mapper */