Merge branch 'master' into upstream

[linux-2.6-omap-h63xx.git] / arch / arm / mach-s3c2410 / usb-simtec.c

diff --git a/arch/arm/mach-s3c2410/usb-simtec.c b/arch/arm/mach-s3c2410/usb-simtec.c
index 495f8c6ffcb6e6d39c51bbb67d95e63688c86c5c..6b22d8f0a00df5de142bed58ee9adbce2f0a2612 100644 (file)
--- a/arch/arm/mach-s3c2410/usb-simtec.c
+++ b/arch/arm/mach-s3c2410/usb-simtec.c
@@ -85,8 +85,8 @@ static void usb_simtec_enableoc(struct s3c2410_hcd_info *info, int on)
 
        if (on) {
                ret = request_irq(IRQ_USBOC, usb_simtec_ocirq,
-                                 SA_INTERRUPT | SA_TRIGGER_RISING |
-                                  SA_TRIGGER_FALLING,
+                                 IRQF_DISABLED | IRQF_TRIGGER_RISING |
+                                  IRQF_TRIGGER_FALLING,
                                  "USB Over-current", info);
                if (ret != 0) {
                        printk(KERN_ERR "failed to request usb oc irq\n");