projects
/
profile
/
ivi
/
kernel-x86-ivi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
[profile/ivi/kernel-x86-ivi.git]
/
drivers
/
usb
/
host
/
ohci-au1xxx.c
diff --git
a/drivers/usb/host/ohci-au1xxx.c
b/drivers/usb/host/ohci-au1xxx.c
index
299d719
..
9b66df8
100644
(file)
--- a/
drivers/usb/host/ohci-au1xxx.c
+++ b/
drivers/usb/host/ohci-au1xxx.c
@@
-129,7
+129,7
@@
static int ohci_hcd_au1xxx_drv_probe(struct platform_device *pdev)
ohci_hcd_init(hcd_to_ohci(hcd));
ret = usb_add_hcd(hcd, pdev->resource[1].start,
- IRQF_
DISABLED | IRQF_
SHARED);
+ IRQF_SHARED);
if (ret == 0) {
platform_set_drvdata(pdev, hcd);
return ret;