Commit fc05ea77 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/host-mvebu' into next 

* pci/host-mvebu:
  PCI: mvebu: Remove redundant of_match_ptr
parents 4bd70bc9 339135ff

drivers/pci/host/pci-mvebu.c

+1 −2
Original line number Diff line number Diff line
@@ -1012,8 +1012,7 @@ static struct platform_driver mvebu_pcie_driver = { 
	.driver = {

		.owner = THIS_MODULE,

		.name = "mvebu-pcie",

		.of_match_table =

		   of_match_ptr(mvebu_pcie_of_match_table),

		.of_match_table = mvebu_pcie_of_match_table,

		/* driver unloading/unbinding currently not supported */

		.suppress_bind_attrs = true,

	},