diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-11-29 04:51:07 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-11-29 04:51:07 -0500 |
| commit | 0d2cd91bf7b1a7cc1d638296111fcc2bcf5c0bb4 (patch) | |
| tree | d2ca69347816c27f9dc352581f5d0fe76811cd49 /drivers/usb/host/ohci-ppc-of.c | |
| parent | 3d95fd6ad8d3cf582a70ed65660017114b6e4065 (diff) | |
| parent | caca6a03d365883564885f2c1da3e88dcf65d139 (diff) | |
Merge commit 'v3.2-rc3' into next
Diffstat (limited to 'drivers/usb/host/ohci-ppc-of.c')
| -rw-r--r-- | drivers/usb/host/ohci-ppc-of.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/ohci-ppc-of.c b/drivers/usb/host/ohci-ppc-of.c index 0c12f4e14dcd..d24cc89de16f 100644 --- a/drivers/usb/host/ohci-ppc-of.c +++ b/drivers/usb/host/ohci-ppc-of.c | |||
| @@ -143,7 +143,7 @@ static int __devinit ohci_hcd_ppc_of_probe(struct platform_device *op) | |||
| 143 | 143 | ||
| 144 | ohci_hcd_init(ohci); | 144 | ohci_hcd_init(ohci); |
| 145 | 145 | ||
| 146 | rv = usb_add_hcd(hcd, irq, IRQF_DISABLED); | 146 | rv = usb_add_hcd(hcd, irq, 0); |
| 147 | if (rv == 0) | 147 | if (rv == 0) |
| 148 | return 0; | 148 | return 0; |
| 149 | 149 | ||