PCI/AER: Squash Kconfig.debug into Kconfig

Squash Kconfig.debug into Kconfig.  No functional change intended.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Keith Busch <keith.busch@intel.com>

diff --git a/drivers/pci/pcie/aer/Kconfig b/drivers/pci/pcie/aer/Kconfig
index 5a64eb3d6c7a0546a01697a1041f622110df10ff..1996df082e896b79986f0903f9e8677c046a9df9 100644 (file)
--- a/drivers/pci/pcie/aer/Kconfig
+++ b/drivers/pci/pcie/aer/Kconfig
@@ -13,6 +13,20 @@ config PCIEAER
          (AER) driver support. Error reporting messages sent to Root
          Port will be handled by PCI Express AER driver.
 
+config PCIEAER_INJECT
+       tristate "PCIe AER error injector support"
+       depends on PCIEAER
+       default n
+       help
+         This enables PCI Express Root Port Advanced Error Reporting
+         (AER) software error injector.
+
+         Debugging PCIe AER code is quite difficult because it is hard
+         to trigger various real hardware errors. Software based
+         error injection can fake almost all kinds of errors with the
+         help of a user space helper tool aer-inject, which can be
+         gotten from:
+            http://www.kernel.org/pub/linux/utils/pci/aer-inject/
 
 #
 # PCI Express ECRC
@@ -25,5 +39,3 @@ config PCIE_ECRC
          (transaction layer end-to-end CRC checking).
 
          When in doubt, say N.
-
-source "drivers/pci/pcie/aer/Kconfig.debug"

diff --git a/drivers/pci/pcie/aer/Kconfig.debug b/drivers/pci/pcie/aer/Kconfig.debug
deleted file mode 100644 (file)
index 67e0217..0000000
--- a/drivers/pci/pcie/aer/Kconfig.debug
+++ /dev/null
@@ -1,19 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-#
-# PCI Express Root Port Device AER Debug Configuration
-#
-
-config PCIEAER_INJECT
-       tristate "PCIe AER error injector support"
-       depends on PCIEAER
-       default n
-       help
-         This enables PCI Express Root Port Advanced Error Reporting
-         (AER) software error injector.
-
-         Debugging PCIe AER code is quite difficult because it is hard
-         to trigger various real hardware errors. Software based
-         error injection can fake almost all kinds of errors with the
-         help of a user space helper tool aer-inject, which can be
-         gotten from:
-            http://www.kernel.org/pub/linux/utils/pci/aer-inject/