md: cancel check/repair requests when recovery is needed

[linux-2.6] / arch / arm / plat-s3c24xx / irq.c

diff --git a/arch/arm/plat-s3c24xx/irq.c b/arch/arm/plat-s3c24xx/irq.c
index ae2c5d7efc9dc411cc1488840bee40d8b648a456..001436c04b13b53e697c328929467667acf19dc2 100644 (file)
--- a/arch/arm/plat-s3c24xx/irq.c
+++ b/arch/arm/plat-s3c24xx/irq.c
@@ -292,27 +292,27 @@ s3c_irqext_type(unsigned int irq, unsigned int type)
        /* Set the external interrupt to pointed trigger type */
        switch (type)
        {
-               case IRQT_NOEDGE:
+               case IRQ_TYPE_NONE:
                        printk(KERN_WARNING "No edge setting!\n");
                        break;
 
-               case IRQT_RISING:
+               case IRQ_TYPE_EDGE_RISING:
                        newvalue = S3C2410_EXTINT_RISEEDGE;
                        break;
 
-               case IRQT_FALLING:
+               case IRQ_TYPE_EDGE_FALLING:
                        newvalue = S3C2410_EXTINT_FALLEDGE;
                        break;
 
-               case IRQT_BOTHEDGE:
+               case IRQ_TYPE_EDGE_BOTH:
                        newvalue = S3C2410_EXTINT_BOTHEDGE;
                        break;
 
-               case IRQT_LOW:
+               case IRQ_TYPE_LEVEL_LOW:
                        newvalue = S3C2410_EXTINT_LOWLEV;
                        break;
 
-               case IRQT_HIGH:
+               case IRQ_TYPE_LEVEL_HIGH:
                        newvalue = S3C2410_EXTINT_HILEV;
                        break;