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

From: Stephen Rothwell
Date: Mon Mar 18 2013 - 23:39:37 EST

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
drivers/usb/gadget/amd5536udc.c between commit 6c39d90393a2 ("usb:
gadget: amd5536udc: remove unnecessary initializations") from the tree
and commit "drivers/usb/gadget/amd5536udc.c: avoid calling dma_pool_create()
with NULL dev" from the akpm tree.

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

Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/usb/gadget/amd5536udc.c
index f52dcfe,142616a..0000000
--- a/drivers/usb/gadget/amd5536udc.c
+++ b/drivers/usb/gadget/amd5536udc.c
@@@ -3232,6 -3235,12 +3232,10 @@@ static int udc_pci_probe

+ dev->phys_addr = resource;
+ dev->irq = pdev->irq;
+ dev->pdev = pdev;
- dev-> = &pdev->dev;
- dev-> = pdev->dev.dma_mask;
/* init dma pools */
if (use_dma) {
retval = init_dma_pools(dev);

Attachment: pgp00000.pgp
Description: PGP signature