summaryrefslogtreecommitdiffstats
path: root/drivers/pci/host
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2013-12-20 12:40:54 -0700
committerBjorn Helgaas <bhelgaas@google.com>2013-12-20 12:40:54 -0700
commitfc05ea771af6e1b59b92bfd169909526f0a314ad (patch)
treed387d9a41e1d5571013470f52d98bcfa994ecae1 /drivers/pci/host
parent4bd70bc997afbc7d6a2f57739b34802611dfe455 (diff)
parent339135ff1b5fca9a323ca7af67cebefedf50d4e7 (diff)
downloadlinux-fc05ea771af6e1b59b92bfd169909526f0a314ad.tar.bz2
Merge branch 'pci/host-mvebu' into next
* pci/host-mvebu: PCI: mvebu: Remove redundant of_match_ptr
Diffstat (limited to 'drivers/pci/host')
-rw-r--r--drivers/pci/host/pci-mvebu.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/pci/host/pci-mvebu.c b/drivers/pci/host/pci-mvebu.c
index 533e0df02718..bedc0b1562b9 100644
--- a/drivers/pci/host/pci-mvebu.c
+++ b/drivers/pci/host/pci-mvebu.c
@@ -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,
},