]> git.baikalelectronics.ru Git - kernel.git/commit
PCI/AER: Remove duplicate PCI_EXP_AER_FLAGS definition
authorBjorn Helgaas <bhelgaas@google.com>
Tue, 31 Jul 2018 21:26:09 +0000 (16:26 -0500)
committerBjorn Helgaas <bhelgaas@google.com>
Tue, 31 Jul 2018 21:26:09 +0000 (16:26 -0500)
commitc894426b8f72834d5947db900086a497742c9494
treefe39cb4fd2ef2ad499d02b1223329fd75d07efce
parentbfb559c5aac3431245934019c377e5801bd8bd36
PCI/AER: Remove duplicate PCI_EXP_AER_FLAGS definition

PCI_EXP_AER_FLAGS was defined twice (with identical definitions), once
under #ifdef CONFIG_ACPI_APEI, and again at the top level.  This looks like
my merge error from these commits:

  417d3a23bba0 ("PCI/AER: Squash aerdrv_core.c into aerdrv.c")
  84c14eeb9d7f ("PCI/AER: Squash ecrc.c into aerdrv.c")

Remove the duplicate PCI_EXP_AER_FLAGS definition.

Fixes: 84c14eeb9d7f ("PCI/AER: Squash ecrc.c into aerdrv.c")
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Oza Pawandeep <poza@codeaurora.org>
drivers/pci/pcie/aer.c