linux-next: manual merge of the usb tree with the usb.current tree

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/usb/host/ohci-at91.c between commit fb5f1834c322 ("usb:
ohci-at91: fix irq and iomem resource retrieval") from the usb.current
tree and commit 3c9740a117d4 ("usb: hcd: move controller wakeup setting
initialization to individual driver") from the usb tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/usb/host/ohci-at91.c
index 8c356af79409,29d2093e3cee..000000000000
--- a/drivers/usb/host/ohci-at91.c
+++ b/drivers/usb/host/ohci-at91.c
@@@ -203,9 -199,11 +203,11 @@@ static int usb_hcd_at91_probe(const str
  	ohci->num_ports = board->ports;
  	at91_start_hc(pdev);
  
 -	retval = usb_add_hcd(hcd, pdev->resource[1].start, IRQF_SHARED);
 +	retval = usb_add_hcd(hcd, irq, IRQF_SHARED);
- 	if (retval == 0)
+ 	if (retval == 0) {
+ 		device_wakeup_enable(hcd->self.controller);
  		return retval;
+ 	}
  
  	/* Error handling */
  	at91_stop_hc(pdev);

Attachment: pgp00000.pgp
Description: PGP signature