diff mbox series

[v2] UBUNTU: [Config] disable PCI_MESON

Message ID 20191218110307.15706-1-paolo.pisati@canonical.com
State New
Headers show
Series [v2] UBUNTU: [Config] disable PCI_MESON | expand

Commit Message

Paolo Pisati Dec. 18, 2019, 11:03 a.m. UTC 
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
Acked-by: Colin Ian King <colin.king@canonical.com>
---
 debian.master/config/annotations          | 2 +-
 debian.master/config/config.common.ubuntu | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Comments

Seth Forshee Jan. 8, 2020, 3:34 a.m. UTC | #1 
On Wed, Dec 18, 2019 at 12:03:07PM +0100, Paolo Pisati wrote:
> Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
> Acked-by: Colin Ian King <colin.king@canonical.com>

Applied to focal/master-next and unstable/master, thanks!
diff mbox series

Patch

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 5ae674f8d89a..3f2171a51159 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -6407,7 +6407,7 @@  CONFIG_PCIE_QCOM                                policy<{'arm64': 'y', 'armhf': '
 CONFIG_PCIE_ARMADA_8K                           policy<{'arm64': 'y', 'armhf': 'y'}>
 CONFIG_PCIE_KIRIN                               policy<{'arm64': 'y'}>
 CONFIG_PCIE_HISI_STB                            policy<{'arm64': 'y', 'armhf': 'y'}>
-CONFIG_PCI_MESON                                policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y'}>
+CONFIG_PCI_MESON                                policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': '-', 's390x': '-'}>
 CONFIG_PCIE_UNIPHIER                            policy<{'armhf': 'y'}>
 CONFIG_PCIE_AL                                  policy<{'arm64': 'y'}>
 
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index dcfe741c7471..a3a027bf57c1 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -7005,7 +7005,7 @@  CONFIG_PCI_KEYSTONE_HOST=y
 CONFIG_PCI_LABEL=y
 CONFIG_PCI_LAYERSCAPE_EP=y
 CONFIG_PCI_LOCKLESS_CONFIG=y
-CONFIG_PCI_MESON=y
+# CONFIG_PCI_MESON is not set
 CONFIG_PCI_MMCONFIG=y
 CONFIG_PCI_MSI=y
 CONFIG_PCI_MSI_IRQ_DOMAIN=y