Merge remote-tracking branch 'scott/next' into next

[~andy/linux] / arch / arm / mach-s3c64xx / mach-smartq.c

diff --git a/arch/arm/mach-s3c64xx/mach-smartq.c b/arch/arm/mach-s3c64xx/mach-smartq.c
index a6b338fd0470d6b55f0601058f4dc5446cfc480c..6e72bd5c1d0cc934232ea27d8953a5da8048ecf1 100644 (file)
--- a/arch/arm/mach-s3c64xx/mach-smartq.c
+++ b/arch/arm/mach-s3c64xx/mach-smartq.c
@@ -25,6 +25,7 @@
 
 #include <mach/map.h>
 #include <mach/regs-gpio.h>
+#include <mach/gpio-samsung.h>
 
 #include <plat/clock.h>
 #include <plat/cpu.h>
@@ -106,7 +107,7 @@ static void smartq_usb_host_enableoc(struct s3c2410_hcd_info *info, int on)
 
        if (on) {
                ret = request_irq(gpio_to_irq(S3C64XX_GPL(10)),
-                                 smartq_usb_host_ocirq, IRQF_DISABLED |
+                                 smartq_usb_host_ocirq,
                                  IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
                                  "USB host overcurrent", info);
                if (ret != 0)