Merge branch 'pci/host-mvebu' into next

* pci/host-mvebu:
  PCI: mvebu: Remove redundant of_match_ptr
This commit is contained in:
Bjorn Helgaas 2013-12-20 12:40:54 -07:00
commit fc05ea771a

View File

@ -1012,8 +1012,7 @@ static struct platform_driver mvebu_pcie_driver = {
.driver = { .driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.name = "mvebu-pcie", .name = "mvebu-pcie",
.of_match_table = .of_match_table = mvebu_pcie_of_match_table,
of_match_ptr(mvebu_pcie_of_match_table),
/* driver unloading/unbinding currently not supported */ /* driver unloading/unbinding currently not supported */
.suppress_bind_attrs = true, .suppress_bind_attrs = true,
}, },