[d/azure][PATCH 2/2] UBUNTU: [Config] linux-azure: CONFIG_CATAPULT_PCI=m
Marcelo Henrique Cerri
marcelo.cerri at canonical.com
Fri May 31 15:59:05 UTC 2019
BugLink: http://bugs.launchpad.net/bugs/1824879
Signed-off-by: Marcelo Henrique Cerri <marcelo.cerri at canonical.com>
---
debian.azure/config/annotations | 3 +++
debian.azure/config/config.common.ubuntu | 1 +
debian.azure/control.d/azure.inclusion-list | 1 +
3 files changed, 5 insertions(+)
diff --git a/debian.azure/config/annotations b/debian.azure/config/annotations
index 9b979c987e4b..3c8c16421f5e 100644
--- a/debian.azure/config/annotations
+++ b/debian.azure/config/annotations
@@ -37,6 +37,9 @@ CONFIG_NO_HZ_IDLE note<LP:#1818138> mark<ENFORC
CONFIG_HOTPLUG_CPU policy<{'amd64': 'y'}>
CONFIG_HOTPLUG_CPU note<LP:#1821934> mark<ENFORCED>
+CONFIG_CATAPULT_PCI policy<{'amd64': 'm'}>
+CONFIG_CATAPULT_PCI mark<ENFORCED> note<LP:#1824879>
+
CONFIG_HYPERV policy<{'amd64': 'y'}>
CONFIG_HYPERV mark<ENFORCED> note<LP:#1690136>
diff --git a/debian.azure/config/config.common.ubuntu b/debian.azure/config/config.common.ubuntu
index 3e12df2a0974..b448bf381b8d 100644
--- a/debian.azure/config/config.common.ubuntu
+++ b/debian.azure/config/config.common.ubuntu
@@ -590,6 +590,7 @@ CONFIG_CAN_SLCAN=m
CONFIG_CAN_VCAN=m
CONFIG_CAN_VXCAN=m
CONFIG_CARDBUS=y
+CONFIG_CATAPULT_PCI=m
# CONFIG_CB710_CORE is not set
CONFIG_CC_HAS_ASM_GOTO=y
CONFIG_CC_HAS_KASAN_GENERIC=y
diff --git a/debian.azure/control.d/azure.inclusion-list b/debian.azure/control.d/azure.inclusion-list
index bdce9eff42e1..cb0569fccd6c 100644
--- a/debian.azure/control.d/azure.inclusion-list
+++ b/debian.azure/control.d/azure.inclusion-list
@@ -30,6 +30,7 @@ drivers/block/nbd.ko
drivers/block/rbd.ko
drivers/block/virtio_blk.ko
drivers/block/xen-blkfront.ko
+drivers/catapult/catapult.ko
drivers/char/hangcheck-timer.ko
drivers/char/hw_random/powernv-rng.ko
drivers/char/hw_random/virtio-rng.ko
--
2.20.1
More information about the kernel-team
mailing list