UBUNTU: [Config] CONFIG_HISI_PMU=m

BugLink: https://launchpad.net/bugs/1956086
Signed-off-by: Ike Panhc <ike.pan@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index d23c9a81bef5aa16117eeae180a2ba38b341d526..00683d2efa9e0ab4597749ba3698e5f217657c71 100644 (file)
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -7299,7 +7299,7 @@ CONFIG_THUNDERX2_PMU                            policy<{'arm64': 'm'}>
 CONFIG_XGENE_PMU                                policy<{'arm64': 'y'}>
 CONFIG_ARM_SPE_PMU                              policy<{'arm64': 'm'}>
 CONFIG_ARM_DMC620_PMU                           policy<{'arm64': 'm'}>
-CONFIG_HISI_PMU                                 policy<{'arm64': 'y'}>
+CONFIG_HISI_PMU                                 policy<{'arm64': 'm'}>
 
 # Menu: Device Drivers >> Pin controllers
 CONFIG_PINCTRL                                  policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'n'}>

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 624c11e06d2d31296fcc1719ce9dc943f146713a..ff7b6fa6d27db0b53a2844ca3896323708c5d17a 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -4598,7 +4598,7 @@ CONFIG_HISI_ACC_VFIO_PCI=m
 # CONFIG_HISI_DMA is not set
 CONFIG_HISI_FEMAC=m
 CONFIG_HISI_PCIE_PMU=m
-CONFIG_HISI_PMU=y
+CONFIG_HISI_PMU=m
 CONFIG_HISI_THERMAL=m
 CONFIG_HIST_TRIGGERS=y
 # CONFIG_HIST_TRIGGERS_DEBUG is not set