diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2018-04-04 13:28:52 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <helgaas@kernel.org> | 2018-04-04 13:28:52 -0500 |
| commit | df25d407afa5e929449dc78f89588617d27d4983 (patch) | |
| tree | 4773c84967937490e8a624664538233add445930 /drivers/pci | |
| parent | 11ee09055207cb75a23862e2c983700f3c01f3af (diff) | |
| parent | 2380ca5f1f46412d08c96ebea996e049548829bd (diff) | |
| download | linux-df25d407afa5e929449dc78f89588617d27d4983.tar.gz linux-df25d407afa5e929449dc78f89588617d27d4983.tar.bz2 linux-df25d407afa5e929449dc78f89588617d27d4983.zip | |
Merge branch 'lorenzo/pci/rcar'
* lorenzo/pci/rcar:
dt-bindings: PCI: rcar: Add device tree support for r8a7743
PCI: rcar-gen2: Remove duplicated bit-wise or of RCAR_PCI_INT_SIGRETABORT
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/host/pci-rcar-gen2.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/pci/host/pci-rcar-gen2.c b/drivers/pci/host/pci-rcar-gen2.c index a28370bb2b2a..dd4f1a6b57c5 100644 --- a/drivers/pci/host/pci-rcar-gen2.c +++ b/drivers/pci/host/pci-rcar-gen2.c @@ -53,7 +53,6 @@ #define RCAR_PCI_INT_PME (1 << 19) #define RCAR_PCI_INT_ALLERRORS (RCAR_PCI_INT_SIGTABORT | \ RCAR_PCI_INT_SIGRETABORT | \ - RCAR_PCI_INT_SIGRETABORT | \ RCAR_PCI_INT_REMABORT | \ RCAR_PCI_INT_PERR | \ RCAR_PCI_INT_SIGSERR | \ |