projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...
[linux-2.6-block.git]
/
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 5629df905fcdac2f422013f263dd97f65ffe4338..6e72bd5c1d0cc934232ea27d8953a5da8048ecf1 100644
(file)
--- a/
arch/arm/mach-s3c64xx/mach-smartq.c
+++ b/
arch/arm/mach-s3c64xx/mach-smartq.c
@@
-107,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)