Skip to content

Commit

Permalink
Merge branch 'remotes/lorenzo/pci/mediatek'
Browse files Browse the repository at this point in the history
- Rename the pcie-mediatek-gen3 driver from 'mtk-pcie' to 'mtk-pcie-gen3'
  so it can coexist with the pcie-mediatek driver, which also uses
  'mtk-pcie' (Felix Fietkau)

* remotes/lorenzo/pci/mediatek:
  PCI: mediatek-gen3: Change driver name to mtk-pcie-gen3
  • Loading branch information
Bjorn Helgaas committed Oct 5, 2022
2 parents fefb75d + 034fdac commit 7cb0a66
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/pci/controller/pcie-mediatek-gen3.c
Original file line number Diff line number Diff line change
Expand Up @@ -1071,7 +1071,7 @@ static struct platform_driver mtk_pcie_driver = {
.probe = mtk_pcie_probe,
.remove = mtk_pcie_remove,
.driver = {
.name = "mtk-pcie",
.name = "mtk-pcie-gen3",
.of_match_table = mtk_pcie_of_match,
.pm = &mtk_pcie_pm_ops,
},
Expand Down

0 comments on commit 7cb0a66

Please sign in to comment.