Commit 7cb0a666 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

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
parents fefb75d8 034fdac0

drivers/pci/controller/pcie-mediatek-gen3.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

	},