summaryrefslogtreecommitdiffstats
path: root/sys/conf
diff options
context:
space:
mode:
authordumbbell <dumbbell@FreeBSD.org>2015-03-01 20:54:29 +0000
committerdumbbell <dumbbell@FreeBSD.org>2015-03-01 20:54:29 +0000
commit9fe852c3ed6360ea38fda6ba6913336892732f8b (patch)
tree41161c168ffd589bb556a9284c38e9dc84f4be0f /sys/conf
parent780272dc118b1b7e6606343e08d25a130d3be1bb (diff)
downloadFreeBSD-src-9fe852c3ed6360ea38fda6ba6913336892732f8b.zip
FreeBSD-src-9fe852c3ed6360ea38fda6ba6913336892732f8b.tar.gz
Record the dependency to x86bios in vga_pci
This fixes the build of XEN and XBOX kernels on i386, which was broken in r279487. While here, do not build vga_pci_repost() on PC98. Reported by: bz@
Diffstat (limited to 'sys/conf')
-rw-r--r--sys/conf/files.amd646
-rw-r--r--sys/conf/files.i3864
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64
index 1584869..7e0fb50 100644
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
@@ -513,10 +513,10 @@ compat/ndis/winx64_wrap.S optional ndisapi pci
libkern/memmove.c standard
libkern/memset.c standard
#
-# x86 real mode BIOS emulator, required by atkbdc/dpms/vesa
+# x86 real mode BIOS emulator, required by atkbdc/dpms/pci/vesa
#
-compat/x86bios/x86bios.c optional x86bios | atkbd | dpms | vesa
-contrib/x86emu/x86emu.c optional x86bios | atkbd | dpms | vesa
+compat/x86bios/x86bios.c optional x86bios | atkbd | dpms | pci | vesa
+contrib/x86emu/x86emu.c optional x86bios | atkbd | dpms | pci | vesa
#
# bvm console
#
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index 3253341..d3e743b 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -531,9 +531,9 @@ i386/xbox/xboxfb.c optional xboxfb
dev/fb/boot_font.c optional xboxfb
i386/xbox/pic16l.s optional xbox
#
-# x86 real mode BIOS support, required by atkbdc/dpms/vesa
+# x86 real mode BIOS support, required by atkbdc/dpms/pci/vesa
#
-compat/x86bios/x86bios.c optional x86bios | atkbd | dpms | vesa
+compat/x86bios/x86bios.c optional x86bios | atkbd | dpms | pci | vesa
#
# bvm console
#
OpenPOWER on IntegriCloud