summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2024-10-05 10:59:44 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2024-10-05 10:59:44 -0700
commitfc20a3e57247e21e1bd582f604b20bf898f7d111 (patch)
tree441f80608a87ee50ff47be2f170a03938d0e157d
parentfdd0a94dcf7fdebaebe1b9c59614a41b6f9aa651 (diff)
parent9af48210ea5f1539e1999154b0acd343efdb370b (diff)
downloadlwn-fc20a3e57247e21e1bd582f604b20bf898f7d111.tar.gz
lwn-fc20a3e57247e21e1bd582f604b20bf898f7d111.zip
Merge tag 'for-linus-6.12a-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull xen fix from Juergen Gross: "Fix Xen config issue introduced in the merge window" * tag 'for-linus-6.12a-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip: xen: Fix config option reference in XEN_PRIVCMD definition
-rw-r--r--drivers/xen/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/xen/Kconfig b/drivers/xen/Kconfig
index 62035fe16bb8..72ddee4c1544 100644
--- a/drivers/xen/Kconfig
+++ b/drivers/xen/Kconfig
@@ -261,7 +261,7 @@ config XEN_SCSI_BACKEND
config XEN_PRIVCMD
tristate "Xen hypercall passthrough driver"
depends on XEN
- imply CONFIG_XEN_PCIDEV_BACKEND
+ imply XEN_PCIDEV_BACKEND
default m
help
The hypercall passthrough driver allows privileged user programs to