]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'pci/host-mvebu' into next
authorBjorn Helgaas <bhelgaas@google.com>
Fri, 20 Dec 2013 19:40:54 +0000 (12:40 -0700)
committerBjorn Helgaas <bhelgaas@google.com>
Fri, 20 Dec 2013 19:40:54 +0000 (12:40 -0700)
* pci/host-mvebu:
  PCI: mvebu: Remove redundant of_match_ptr

drivers/pci/host/pci-mvebu.c

index 533e0df027189bff4429acf6e026967081049817..bedc0b1562b9bee2be8ed647d41bd88cd934e2f9 100644 (file)
@@ -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,
        },