diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-13 01:13:10 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-13 01:13:10 +0400 |
| commit | 6b458ac195c51790830b2267bdf3edaae27eab3e (patch) | |
| tree | 0207fb3977b0ac1a56bef95aa3a23e528915799b /drivers/phy/Kconfig | |
| parent | 78b3d1c24deb46a8bed6e1be816dc64d344777f8 (diff) | |
| parent | eb82a3d846fab00c4b9ad6bbe5ade4fa5febc0af (diff) | |
| download | linux-6b458ac195c51790830b2267bdf3edaae27eab3e.tar.xz | |
Merge tag 'usb-3.16-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
Pull USB fixes from Greg KH:
"Here are some small USB fixes, PHY driver fixes (they ended up in this
tree for lack of somewhere else to put them), and some new USB device
ids"
* tag 'usb-3.16-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
phy: omap-usb2: Balance pm_runtime_enable() on probe failure and remove
phy: core: Fix error path in phy_create()
drivers: phy: phy-samsung-usb2.c: Add missing MODULE_DEVICE_TABLE
phy: omap-usb2: fix devm_ioremap_resource error detection code
phy: sun4i: depend on RESET_CONTROLLER
USB: serial: ftdi_sio: Add Infineon Triboard
USB: ftdi_sio: Add extra PID.
usb: option: Add ID for Telewell TW-LTE 4G v2
USB: cp210x: add support for Corsair usb dongle
Diffstat (limited to 'drivers/phy/Kconfig')
| -rw-r--r-- | drivers/phy/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig index fcdfe7c0e4a7..64b98d242ea6 100644 --- a/drivers/phy/Kconfig +++ b/drivers/phy/Kconfig @@ -112,6 +112,7 @@ config PHY_EXYNOS5250_SATA config PHY_SUN4I_USB tristate "Allwinner sunxi SoC USB PHY driver" depends on ARCH_SUNXI && HAS_IOMEM && OF + depends on RESET_CONTROLLER select GENERIC_PHY help Enable this to support the transceiver that is part of Allwinner |