diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2022-10-05 17:32:56 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2022-10-05 17:32:56 -0500 |
| commit | 7cb0a666998ddc5c2ca9c5dcaf916dd48c4eef0c (patch) | |
| tree | 80df1b937a60b1f71f1be02a23114415a232355a | |
| parent | fefb75d842494f54c7ff0931ecec66c988eff0c9 (diff) | |
| parent | 034fdac01fe5184e63d8af901ddb9c9a329f6902 (diff) | |
Merge branch 'remotes/lorenzo/pci/mediatek'
- 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
| -rw-r--r-- | drivers/pci/controller/pcie-mediatek-gen3.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/controller/pcie-mediatek-gen3.c b/drivers/pci/controller/pcie-mediatek-gen3.c index 11cdb9b6f109..b8612ce5f4d0 100644 --- a/drivers/pci/controller/pcie-mediatek-gen3.c +++ b/drivers/pci/controller/pcie-mediatek-gen3.c @@ -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, }, |