projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus-dma-masks' of git://git.linaro.org/people/rmk/linux-arm
[cascardo/linux.git]
/
drivers
/
usb
/
host
/
uhci-platform.c
diff --git
a/drivers/usb/host/uhci-platform.c
b/drivers/usb/host/uhci-platform.c
index
f8548b7
..
3003fef
100644
(file)
--- a/
drivers/usb/host/uhci-platform.c
+++ b/
drivers/usb/host/uhci-platform.c
@@
-104,8
+104,7
@@
static int uhci_hcd_platform_probe(struct platform_device *pdev)
uhci->regs = hcd->regs;
- ret = usb_add_hcd(hcd, pdev->resource[1].start, IRQF_DISABLED |
- IRQF_SHARED);
+ ret = usb_add_hcd(hcd, pdev->resource[1].start, IRQF_SHARED);
if (ret)
goto err_uhci;