diff --git a/[refs] b/[refs] index 09cacf9e8708..3f32f7283d77 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1048d83d5bfcbf1c71391fc1aae57326e940149c +refs/heads/master: 2b5ced1a0cf2407e2bbe66e49687f6eb59d5df94 diff --git a/trunk/drivers/usb/gadget/mv_u3d_core.c b/trunk/drivers/usb/gadget/mv_u3d_core.c index e5735fc610de..e6521b195449 100644 --- a/trunk/drivers/usb/gadget/mv_u3d_core.c +++ b/trunk/drivers/usb/gadget/mv_u3d_core.c @@ -1955,8 +1955,6 @@ static int mv_u3d_probe(struct platform_device *dev) u3d->gadget.speed = USB_SPEED_UNKNOWN; /* speed */ /* the "gadget" abstracts/virtualizes the controller */ - u3d->gadget.dev.parent = &dev->dev; - u3d->gadget.dev.dma_mask = dev->dev.dma_mask; u3d->gadget.dev.release = mv_u3d_gadget_release; u3d->gadget.name = driver_name; /* gadget name */