aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/x86/64
diff options
context:
space:
mode:
authorKevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>2020-02-28 18:27:02 +0000
committerKevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>2020-03-02 11:42:31 +0000
commit364739a491ef7f55c7c963c46831ab8487177c2f (patch)
tree1d9919f62a4ba67016c7971020aebf1a97d43397 /target/linux/x86/64
parent4642c4864ef4c8df1749073f6fb6d2de5f51beef (diff)
downloadupstream-364739a491ef7f55c7c963c46831ab8487177c2f.tar.gz
upstream-364739a491ef7f55c7c963c46831ab8487177c2f.tar.bz2
upstream-364739a491ef7f55c7c963c46831ab8487177c2f.zip
kernel: x86_64: drop CALGARY IOMMU on 5.4
It's snuck back in on kernel 5.4 configs, so drop it there too. Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
Diffstat (limited to 'target/linux/x86/64')
-rw-r--r--target/linux/x86/64/config-5.44
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/x86/64/config-5.4 b/target/linux/x86/64/config-5.4
index 7afce44091..ceee923b0f 100644
--- a/target/linux/x86/64/config-5.4
+++ b/target/linux/x86/64/config-5.4
@@ -70,8 +70,8 @@ CONFIG_BLK_MQ_VIRTIO=y
CONFIG_BLK_PM=y
# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
CONFIG_BTT=y
-CONFIG_CALGARY_IOMMU=y
-CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y
+# CONFIG_CALGARY_IOMMU is not set
+# CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT is not set
CONFIG_CONNECTOR=y
# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
# CONFIG_CPU_IDLE_GOV_HALTPOLL is not set