config USB_CHIPIDEA
	tristate "ChipIdea Highspeed Dual Role Controller"
	depends on ((USB_EHCI_HCD && USB_GADGET) || (USB_EHCI_HCD && !USB_GADGET) || (!USB_EHCI_HCD && USB_GADGET)) && HAS_DMA
	select EXTCON
	help
	  Say Y here if your system has a dual role high speed USB
	  controller based on ChipIdea silicon IP. It supports:
	  Dual-role switch (ID, OTG FSM, sysfs), Host-only, and
	  Peripheral-only.

	  When compiled dynamically, the module will be called ci-hdrc.ko.

if USB_CHIPIDEA

config USB_CHIPIDEA_OF
	tristate
	depends on OF
	default USB_CHIPIDEA

config USB_CHIPIDEA_PCI
	tristate
	depends on PCI
	depends on NOP_USB_XCEIV
	default USB_CHIPIDEA

config USB_CHIPIDEA_UDC
	bool "ChipIdea device controller"
	depends on USB_GADGET
	help
	  Say Y here to enable device controller functionality of the
	  ChipIdea driver.

config USB_CHIPIDEA_HOST
	bool "ChipIdea host controller"
	depends on USB_EHCI_HCD
	select USB_EHCI_ROOT_HUB_TT
	help
	  Say Y here to enable host controller functionality of the
	  ChipIdea driver.

endif
='this.form.submit();'>
<option value='emaclite-cleanup'>emaclite-cleanup</option>
<option value='master' selected='selected'>master</option>
<option value='nds-private-remove'>nds-private-remove</option>
<option value='packet-loop-back'>packet-loop-back</option>
<option value='packet-rx-pump-back'>packet-rx-pump-back</option>
</select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>net-next plumbings</td><td class='sub right'>Tobias Klauser</td></tr></table>
<table class='tabs'><tr><td>
<a href='/cgit.cgi/linux/net-next.git/'>summary</a><a href='/cgit.cgi/linux/net-next.git/refs/?id=e2160156bf2a7d5018e99a9993fbcdda0abac09b'>refs</a><a href='/cgit.cgi/linux/net-next.git/log/drivers/usb/host/uhci-hcd.h'>log</a><a href='/cgit.cgi/linux/net-next.git/tree/drivers/usb/host/uhci-hcd.h?id=e2160156bf2a7d5018e99a9993fbcdda0abac09b'>tree</a><a class='active' href='/cgit.cgi/linux/net-next.git/commit/drivers/usb/host/uhci-hcd.h?id=e2160156bf2a7d5018e99a9993fbcdda0abac09b'>commit</a><a href='/cgit.cgi/linux/net-next.git/diff/drivers/usb/host/uhci-hcd.h?id=e2160156bf2a7d5018e99a9993fbcdda0abac09b'>diff</a></td><td class='form'><form class='right' method='get' action='/cgit.cgi/linux/net-next.git/log/drivers/usb/host/uhci-hcd.h'>
<input type='hidden' name='id' value='e2160156bf2a7d5018e99a9993fbcdda0abac09b'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/cgit.cgi/linux/net-next.git/commit/?id=e2160156bf2a7d5018e99a9993fbcdda0abac09b'>root</a>/<a href='/cgit.cgi/linux/net-next.git/commit/drivers?id=e2160156bf2a7d5018e99a9993fbcdda0abac09b'>drivers</a>/<a href='/cgit.cgi/linux/net-next.git/commit/drivers/usb?id=e2160156bf2a7d5018e99a9993fbcdda0abac09b'>usb</a>/<a href='/cgit.cgi/linux/net-next.git/commit/drivers/usb/host?id=e2160156bf2a7d5018e99a9993fbcdda0abac09b'>host</a>/<a href='/cgit.cgi/linux/net-next.git/commit/drivers/usb/host/uhci-hcd.h?id=e2160156bf2a7d5018e99a9993fbcdda0abac09b'>uhci-hcd.h</a></div><div class='content'><div class='cgit-panel'><b>diff options</b><form method='get'><input type='hidden' name='id' value='e2160156bf2a7d5018e99a9993fbcdda0abac09b'/><table><tr><td colspan='2'/></tr><tr><td class='label'>context:</td><td class='ctrl'><select name='context' onchange='this.form.submit();'><option value='1'>1</option><option value='2'>2</option><option value='3' selected='selected'>3</option><option value='4'>4</option><option value='5'>5</option><option value='6'>6</option><option value='7'>7</option><option value='8'>8</option><option value='9'>9</option><option value='10'>10</option><option value='15'>15</option><option value='20'>20</option><option value='25'>25</option><option value='30'>30</option><option value='35'>35</option><option value='40'>40</option></select></td></tr><tr><td class='label'>space:</td><td class='ctrl'><select name='ignorews' onchange='this.form.submit();'><option value='0' selected='selected'>include</option><option value='1'>ignore</option></select></td></tr><tr><td class='label'>mode:</td><td class='ctrl'><select name='dt' onchange='this.form.submit();'><option value='0' selected='selected'>unified</option><option value='1'>ssdiff</option><option value='2'>stat only</option></select></td></tr><tr><td/><td class='ctrl'><noscript><input type='submit' value='reload'/></noscript></td></tr></table></form></div><table summary='commit info' class='commit-info'>
<tr><th>author</th><td>David S. Miller &lt;davem@davemloft.net&gt;</td><td class='right'>2017-02-02 16:54:00 -0500</td></tr>
<tr><th>committer</th><td>David S. Miller &lt;davem@davemloft.net&gt;</td><td class='right'>2017-02-02 16:54:00 -0500</td></tr>
<tr><th>commit</th><td colspan='2' class='oid'><a href='/cgit.cgi/linux/net-next.git/commit/drivers/usb/host/uhci-hcd.h?id=e2160156bf2a7d5018e99a9993fbcdda0abac09b'>e2160156bf2a7d5018e99a9993fbcdda0abac09b</a> (<a href='/cgit.cgi/linux/net-next.git/patch/drivers/usb/host/uhci-hcd.h?id=e2160156bf2a7d5018e99a9993fbcdda0abac09b'>patch</a>)</td></tr>
<tr><th>tree</th><td colspan='2' class='oid'><a href='/cgit.cgi/linux/net-next.git/tree/?id=e2160156bf2a7d5018e99a9993fbcdda0abac09b'>1a70cb13dcfa7ade4c48d8a64d20543abebfb1dc</a> /<a href='/cgit.cgi/linux/net-next.git/tree/drivers/usb/host/uhci-hcd.h?id=e2160156bf2a7d5018e99a9993fbcdda0abac09b'>drivers/usb/host/uhci-hcd.h</a></td></tr>
<tr><th>parent</th><td colspan='2' class='oid'><a href='/cgit.cgi/linux/net-next.git/commit/drivers/usb/host/uhci-hcd.h?id=62e13097c46c69dbd7544ab2cd585ccf48f360a4'>62e13097c46c69dbd7544ab2cd585ccf48f360a4</a> (<a href='/cgit.cgi/linux/net-next.git/diff/drivers/usb/host/uhci-hcd.h?id=e2160156bf2a7d5018e99a9993fbcdda0abac09b&amp;id2=62e13097c46c69dbd7544ab2cd585ccf48f360a4'>diff</a>)</td></tr><tr><th>parent</th><td colspan='2' class='oid'><a href='/cgit.cgi/linux/net-next.git/commit/drivers/usb/host/uhci-hcd.h?id=6d04dfc8966019b8b0977b2cb942351f13d2b178'>6d04dfc8966019b8b0977b2cb942351f13d2b178</a> (<a href='/cgit.cgi/linux/net-next.git/diff/drivers/usb/host/uhci-hcd.h?id=e2160156bf2a7d5018e99a9993fbcdda0abac09b&amp;id2=6d04dfc8966019b8b0977b2cb942351f13d2b178'>diff</a>)</td></tr></table>
<div class='commit-subject'>Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net</div><div class='commit-msg'>All merge conflicts were simple overlapping changes.

Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
</div><div class='diffstat-header'><a href='/cgit.cgi/linux/net-next.git/diff/?id=e2160156bf2a7d5018e99a9993fbcdda0abac09b'>Diffstat</a> (limited to 'drivers/usb/host/uhci-hcd.h')</div><table summary='diffstat' class='diffstat'>