linux-next: manual merge of the usb-gadget tree with Linus' tree

[Stephen Rothwell]

Hi Felipe,

Today's linux-next merge of the usb-gadget tree got conflicts in
drivers/usb/musb/omap2430.c and drivers/usb/musb/tusb6010.c between
commit c1f01be4060b ("usb: musb: fix resource passed from glue layer to
musb") from Linus' tree and commit c1a7d67c1901 ("usb: musb: use
dev_get_platdata()") from the usb-gadget 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/musb/omap2430.c
index f44e8b5,ebb46ec..0000000
--- a/drivers/usb/musb/omap2430.c
+++ b/drivers/usb/musb/omap2430.c
@@@ -481,8 -481,8 +481,8 @@@ static u64 omap2430_dmamask = DMA_BIT_M
  
  static int omap2430_probe(struct platform_device *pdev)
  {
 -	struct resource			musb_resources[2];
 +	struct resource			musb_resources[3];
- 	struct musb_hdrc_platform_data	*pdata = pdev->dev.platform_data;
+ 	struct musb_hdrc_platform_data	*pdata = dev_get_platdata(&pdev->dev);
  	struct omap_musb_board_data	*data;
  	struct platform_device		*musb;
  	struct omap2430_glue		*glue;
diff --cc drivers/usb/musb/tusb6010.c
index 6f8a9ca,2196ee6..0000000
--- a/drivers/usb/musb/tusb6010.c
+++ b/drivers/usb/musb/tusb6010.c
@@@ -1156,8 -1156,8 +1156,8 @@@ static u64 tusb_dmamask = DMA_BIT_MASK(
  
  static int tusb_probe(struct platform_device *pdev)
  {
 -	struct resource musb_resources[2];
 +	struct resource musb_resources[3];
- 	struct musb_hdrc_platform_data	*pdata = pdev->dev.platform_data;
+ 	struct musb_hdrc_platform_data	*pdata = dev_get_platdata(&pdev->dev);
  	struct platform_device		*musb;
  	struct tusb6010_glue		*glue;

Attachment: pgp00000.pgp
Description: PGP signature