aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/phy/phy-hix5hd2-sata.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-09-25 07:11:52 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-09-25 07:11:52 -0400
commit346e2e4a8b47089f4319f114ec9ac3a95b5f0ac8 (patch)
tree0e824d68b72969127abcad85e82b468ed4e23237 /drivers/phy/phy-hix5hd2-sata.c
parent5caf6ae5ce880ec15448b310e47a9515ebb7e808 (diff)
parent4f0eb5d7efe375859b15c97f453113a242bf057b (diff)
Merge tag 'phy-for_3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy into usb-next
Kishon writes: Adds 3 new PHY drivers stih407, stih41x and rcar gen2 PHY. It also includes miscellaneous cleanup of other PHY drivers. Conflicts: MAINTAINERS
Diffstat (limited to 'drivers/phy/phy-hix5hd2-sata.c')
-rw-r--r--drivers/phy/phy-hix5hd2-sata.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/phy/phy-hix5hd2-sata.c b/drivers/phy/phy-hix5hd2-sata.c
index 6a08fa5f81eb..d5d978085c6d 100644
--- a/drivers/phy/phy-hix5hd2-sata.c
+++ b/drivers/phy/phy-hix5hd2-sata.c
@@ -180,7 +180,6 @@ static struct platform_driver hix5hd2_sata_phy_driver = {
180 .probe = hix5hd2_sata_phy_probe, 180 .probe = hix5hd2_sata_phy_probe,
181 .driver = { 181 .driver = {
182 .name = "hix5hd2-sata-phy", 182 .name = "hix5hd2-sata-phy",
183 .owner = THIS_MODULE,
184 .of_match_table = hix5hd2_sata_phy_of_match, 183 .of_match_table = hix5hd2_sata_phy_of_match,
185 } 184 }
186}; 185};