summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Belopuhov <mikeb@cvs.openbsd.org>2016-01-13 20:16:55 +0000
committerMike Belopuhov <mikeb@cvs.openbsd.org>2016-01-13 20:16:55 +0000
commit929f7c8a23f84fa006907bd1da03d2cb93e0e054 (patch)
tree5468ccd4f34600ff12f02205b6512a146b0e387a
parent7a921e0d12ca9fcc2b096302953bcfd8cc3d934e (diff)
Enable Xen support in GENERIC; discussed with deraadt@
-rw-r--r--sys/arch/amd64/conf/GENERIC8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index 27fb72585fa..44e8351f953 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.411 2016/01/12 01:11:15 jcs Exp $
+# $OpenBSD: GENERIC,v 1.412 2016/01/13 20:16:54 mikeb Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -69,8 +69,8 @@ ipmi0 at mainbus? disable # IPMI
vmt0 at pvbus? # VMware Tools
-#xen0 at pvbus? # Xen HVM domU
-#xnf* at xen? # Xen Netfront
+xen0 at pvbus? # Xen HVM domU
+xnf* at xen? # Xen Netfront
option PCIVERBOSE
option USBVERBOSE
@@ -610,7 +610,7 @@ hifn* at pci? # Hi/fn 7751 crypto card
ubsec* at pci? # Bluesteel Networks 5xxx crypto card
safe* at pci? # SafeNet SafeXcel 1141/1741
-#xspd0 at pci? # XenSource Platform Device
+xspd0 at pci? # XenSource Platform Device
# 1-Wire devices
option ONEWIREVERBOSE