From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Mon, 12 Dec 2011 23:19:40 +0000 (-0800)
Subject: Merge branch 'for-next/dwc3' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi... 
X-Git-Tag: next-20111213~13^2~1
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=007d00d4c11b30b8fd7ff23b9d5aed3743e41f74;p=karo-tx-linux.git

Merge branch 'for-next/dwc3' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next

* 'for-next/dwc3' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb: (392 commits)
  usb: dwc3: ep0: fix for possible early delayed_status
  usb: dwc3: gadget: fix stream enable bit
  usb: dwc3: ep0: fix GetStatus handling (again)
  usb: dwc3: ep0: use dwc3_request for ep0 requsts instead of usb_request
  usb: dwc3: use correct hwparam register for power mgm check
  usb: dwc3: omap: move to module_platform_driver
  usb: dwc3: workaround: missing disconnect event
  usb: dwc3: workaround: missing USB3 Reset event
  usb: dwc3: workaround: U1/U2 -> U0 transiton
  usb: dwc3: gadget: return early in dwc3_cleanup_done_reqs()
  usb: dwc3: ep0: handle delayed_status again
  usb: dwc3: ep0: push ep0state into xfernotready processing
  usb: dwc3: fix sparse errors
  usb: dwc3: fix few coding style problems
  usb: dwc3: move generic dwc3 code from gadget into core
  usb: dwc3: use a helper function for operation mode setting
  usb: dwc3: ep0: don't use ep0in for transfers
  usb: dwc3: ep0: use proper endianess in SetFeature for wIndex
  usb: dwc3: core: drop DWC3_EVENT_BUFFERS_MAX
  usb: dwc3: omap: add multiple instances support to OMAP
  ...
---

007d00d4c11b30b8fd7ff23b9d5aed3743e41f74
diff --cc drivers/usb/dwc3/dwc3-omap.c
index 4e27d5bf40ad,5809bf413d76..3274ac8f1200
--- a/drivers/usb/dwc3/dwc3-omap.c
+++ b/drivers/usb/dwc3/dwc3-omap.c
@@@ -384,8 -394,7 +394,9 @@@ static struct platform_driver dwc3_omap
  	},
  };
  
 +module_platform_driver(dwc3_omap_driver);
 +
+ MODULE_ALIAS("platform:omap-dwc3");
  MODULE_AUTHOR("Felipe Balbi <balbi@ti.com>");
  MODULE_LICENSE("Dual BSD/GPL");
  MODULE_DESCRIPTION("DesignWare USB3 OMAP Glue Layer");