git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'torvalds/master' into perf/core
[sfrench/cifs-2.6.git]
/
drivers
/
virt
/
Kconfig
diff --git
a/drivers/virt/Kconfig
b/drivers/virt/Kconfig
index 80c5f9c16ec17117c64fa361154a3c0000a72bc6..8061e8ef449f0222f5a1da0e59d22a6d76af3aa5 100644
(file)
--- a/
drivers/virt/Kconfig
+++ b/
drivers/virt/Kconfig
@@
-34,4
+34,6
@@
config FSL_HV_MANAGER
source "drivers/virt/vboxguest/Kconfig"
source "drivers/virt/nitro_enclaves/Kconfig"
+
+source "drivers/virt/acrn/Kconfig"
endif