diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-10 21:17:45 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-10 21:17:45 +0300 |
commit | 4a06c8ac2fb3ef484579ce44f9b809bd310fad48 (patch) | |
tree | d7b5e49aaf84737243aadbbafc9d0b2f52877686 /drivers/phy/phy-berlin-sata.c | |
parent | 97d0c931c043646abd1f4c5446a8dfcaba162004 (diff) | |
parent | 72194739f54607bbf8cfded159627a2015381557 (diff) | |
download | linux-4a06c8ac2fb3ef484579ce44f9b809bd310fad48.tar.xz |
Merge tag 'usb-4.3-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
Pull USB fixes from Greg KH:
"Here are some small USB and PHY fixes and quirk updates for 4.3-rc5.
Nothing major here, full details in the shortlog, and all of these
have been in linux-next for a while"
* tag 'usb-4.3-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
usb: Add device quirk for Logitech PTZ cameras
USB: chaoskey read offset bug
USB: Add reset-resume quirk for two Plantronics usb headphones.
usb: renesas_usbhs: Add support for R-Car H3
usb: renesas_usbhs: fix build warning if 64-bit architecture
usb: gadget: bdc: fix memory leak
phy: berlin-sata: Fix module autoload for OF platform driver
phy: rockchip-usb: power down phy when rockchip phy probe
phy: qcom-ufs: fix build error when the component is built as a module
Diffstat (limited to 'drivers/phy/phy-berlin-sata.c')
-rw-r--r-- | drivers/phy/phy-berlin-sata.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/phy/phy-berlin-sata.c b/drivers/phy/phy-berlin-sata.c index 0062027afb1e..77a2e054fdea 100644 --- a/drivers/phy/phy-berlin-sata.c +++ b/drivers/phy/phy-berlin-sata.c @@ -276,6 +276,7 @@ static const struct of_device_id phy_berlin_sata_of_match[] = { { .compatible = "marvell,berlin2q-sata-phy" }, { }, }; +MODULE_DEVICE_TABLE(of, phy_berlin_sata_of_match); static struct platform_driver phy_berlin_sata_driver = { .probe = phy_berlin_sata_probe, |