1 files changed, 11 insertions, 9 deletions

diff --git a/arch/m32r/kernel/setup_mappi3.c b/arch/m32r/kernel/setup_mappi3.c
index 9c79341a7b45..f6ecdf7f555c 100644
--- a/arch/m32r/kernel/setup_mappi3.c
+++ b/arch/m32r/kernel/setup_mappi3.c
@@ -151,7 +151,7 @@ void __init init_IRQ(void)
         disable_mappi3_irq(M32R_IRQ_INT1);
 #endif /* CONFIG_USB */
 
-        /* ICUCR40: CFC IREQ */
+        /* CFC IREQ */
         irq_desc[PLD_IRQ_CFIREQ].status = IRQ_DISABLED;
         irq_desc[PLD_IRQ_CFIREQ].handler = &mappi3_irq_type;
         irq_desc[PLD_IRQ_CFIREQ].action = 0;
@@ -160,7 +160,7 @@ void __init init_IRQ(void)
         disable_mappi3_irq(PLD_IRQ_CFIREQ);
 
 #if defined(CONFIG_M32R_CFC)
-        /* ICUCR41: CFC Insert */
+        /* ICUCR41: CFC Insert & eject */
         irq_desc[PLD_IRQ_CFC_INSERT].status = IRQ_DISABLED;
         irq_desc[PLD_IRQ_CFC_INSERT].handler = &mappi3_irq_type;
         irq_desc[PLD_IRQ_CFC_INSERT].action = 0;
@@ -168,14 +168,16 @@ void __init init_IRQ(void)
         icu_data[PLD_IRQ_CFC_INSERT].icucr = M32R_ICUCR_IEN|M32R_ICUCR_ISMOD00;
         disable_mappi3_irq(PLD_IRQ_CFC_INSERT);
 
-        /* ICUCR42: CFC Eject */
-        irq_desc[PLD_IRQ_CFC_EJECT].status = IRQ_DISABLED;
-        irq_desc[PLD_IRQ_CFC_EJECT].handler = &mappi3_irq_type;
-        irq_desc[PLD_IRQ_CFC_EJECT].action = 0;
-        irq_desc[PLD_IRQ_CFC_EJECT].depth = 1;  /* disable nested irq */
-        icu_data[PLD_IRQ_CFC_EJECT].icucr = M32R_ICUCR_IEN|M32R_ICUCR_ISMOD10;
-        disable_mappi3_irq(PLD_IRQ_CFC_EJECT);
 #endif /* CONFIG_M32R_CFC */
+
+        /* IDE IREQ */
+        irq_desc[PLD_IRQ_IDEIREQ].status = IRQ_DISABLED;
+        irq_desc[PLD_IRQ_IDEIREQ].handler = &mappi3_irq_type;
+        irq_desc[PLD_IRQ_IDEIREQ].action = 0;
+        irq_desc[PLD_IRQ_IDEIREQ].depth = 1;    /* disable nested irq */
+        icu_data[PLD_IRQ_IDEIREQ].icucr = M32R_ICUCR_IEN|M32R_ICUCR_ISMOD10;
+        disable_mappi3_irq(PLD_IRQ_IDEIREQ);
+
 }
 
 #if defined(CONFIG_SMC91X)