UBUNTU: [Config] Update for removal of CONFIG_PCIE_BW

BugLink: https://bugs.launchpad.net/bugs/1919492
This option was removed by stable commit "PCI/LINK: Remove bandwidth
notification", so update the configs and remove the annotation.

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 6e4cde97d9ae357bded361a61bd1e847da115af3..1b9e21432d29bfd4ffadc6cec6b8e438abe72f08 100644 (file)
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -6721,7 +6721,6 @@ CONFIG_PCI_EPF_TEST                             policy<{'amd64': 'n', 'arm64': '
 # Menu: Device Drivers >> PCI support >> PCI Express Port Bus support
 CONFIG_PCIEPORTBUS                              policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'n', 's390x': 'y'}>
 CONFIG_HOTPLUG_PCI_PCIE                         policy<{'amd64': 'y', 'arm64': 'y', 's390x': 'y'}>
-CONFIG_PCIE_BW                                  policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 's390x': 'n'}>
 #
 CONFIG_PCIEPORTBUS                              mark<ENFORCED> note<LP#1665404>
 CONFIG_HOTPLUG_PCI_PCIE                         mark<ENFORCED> note<LP#1374440>

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 22197137bee5d938577d1a8b1faf1dced47ab413..8547702d787847b757556aaf3a7d339bcd5aad11 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -7358,7 +7358,6 @@ CONFIG_PCIE_BUS_DEFAULT=y
 # CONFIG_PCIE_BUS_PERFORMANCE is not set
 # CONFIG_PCIE_BUS_SAFE is not set
 # CONFIG_PCIE_BUS_TUNE_OFF is not set
-# CONFIG_PCIE_BW is not set
 CONFIG_PCIE_CADENCE=y
 CONFIG_PCIE_CADENCE_EP=y
 CONFIG_PCIE_CADENCE_HOST=y