Move most of the contents of opt_compat.h to opt_global.h.

opt_compat.h is mentioned in nearly 180 files. In-progress network
driver compabibility improvements may add over 100 more so this is
closer to "just about everywhere" than "only some files" per the
guidance in sys/conf/options.

Keep COMPAT_LINUX32 in opt_compat.h as it is confined to a subset of
sys/compat/linux/*.c.  A fake _COMPAT_LINUX option ensure opt_compat.h
is created on all architectures.

Move COMPAT_LINUXKPI to opt_dontuse.h as it is only used to control the
set of compiled files.

Reviewed by:	kib, cem, jhb, jtl
Sponsored by:	DARPA, AFRL
Differential Revision:	https://reviews.freebsd.org/D14941

34 files changed, 29 insertions, 74 deletions

diff --git a/sys/modules/aac/Makefile b/sys/modules/aac/Makefile
index 4810d4e141dd..1a5b433688ee 100644
--- a/sys/modules/aac/Makefile
+++ b/sys/modules/aac/Makefile
@@ -8,7 +8,7 @@ SUBDIR= aac_linux
 
 KMOD=	aac
 SRCS=	aac.c aac_pci.c aac_disk.c aac_cam.c
-SRCS+=	opt_scsi.h opt_cam.h opt_compat.h opt_aac.h
+SRCS+=	opt_scsi.h opt_cam.h opt_aac.h
 SRCS+=	device_if.h bus_if.h pci_if.h
 
 # To enable debug output from the driver, uncomment these two lines.
diff --git a/sys/modules/aacraid/Makefile b/sys/modules/aacraid/Makefile
index 2209ead57aa9..8852d477b739 100644
--- a/sys/modules/aacraid/Makefile
+++ b/sys/modules/aacraid/Makefile
@@ -8,7 +8,7 @@ SUBDIR= aacraid_linux
 
 KMOD=	aacraid
 SRCS=	aacraid.c aacraid_pci.c aacraid_cam.c
-SRCS+=	opt_scsi.h opt_cam.h opt_compat.h opt_aacraid.h
+SRCS+=	opt_scsi.h opt_cam.h opt_aacraid.h
 SRCS+=	device_if.h bus_if.h pci_if.h
 
 # To enable debug output from the driver, uncomment these two lines.
diff --git a/sys/modules/cam/Makefile b/sys/modules/cam/Makefile
index 0e76d69dd0bb..2ea5812ce6b6 100644
--- a/sys/modules/cam/Makefile
+++ b/sys/modules/cam/Makefile
@@ -8,7 +8,6 @@ KMOD=	cam
 
 # See sys/conf/options for the flags that go into the different opt_*.h files.
 SRCS=	opt_cam.h
-SRCS+=	opt_compat.h
 SRCS+=	opt_ada.h
 SRCS+=	opt_scsi.h
 SRCS+=	opt_cd.h
diff --git a/sys/modules/cryptodev/Makefile b/sys/modules/cryptodev/Makefile
index 7497772bb0b6..08bed84125af 100644
--- a/sys/modules/cryptodev/Makefile
+++ b/sys/modules/cryptodev/Makefile
@@ -3,6 +3,6 @@
 .PATH:	${SRCTOP}/sys/opencrypto
 KMOD	= cryptodev
 SRCS	= cryptodev.c
-SRCS	+= bus_if.h device_if.h opt_compat.h
+SRCS	+= bus_if.h device_if.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/cuse/Makefile b/sys/modules/cuse/Makefile
index cefd1e03f586..2775da2a7324 100644
--- a/sys/modules/cuse/Makefile
+++ b/sys/modules/cuse/Makefile
@@ -27,6 +27,6 @@
 .PATH: ${SRCTOP}/sys/fs/cuse
 
 KMOD=	cuse
-SRCS=	cuse.c device_if.h bus_if.h vnode_if.h opt_compat.h
+SRCS=	cuse.c device_if.h bus_if.h vnode_if.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/drm2/drm2/Makefile b/sys/modules/drm2/drm2/Makefile
index f267715af6fb..d14cbf8e0c34 100644
--- a/sys/modules/drm2/drm2/Makefile
+++ b/sys/modules/drm2/drm2/Makefile
@@ -53,7 +53,7 @@ SRCS	+= drm_ioc32.c
 .endif
 
 SRCS	+=device_if.h bus_if.h pci_if.h device_if.h iicbus_if.h opt_drm.h \
-	opt_vm.h opt_compat.h opt_syscons.h
+	opt_vm.h opt_syscons.h
 
 
 .if ${MACHINE_CPUARCH} == "powerpc"
diff --git a/sys/modules/drm2/i915kms/Makefile b/sys/modules/drm2/i915kms/Makefile
index 79cf8e08a169..32c19d873040 100644
--- a/sys/modules/drm2/i915kms/Makefile
+++ b/sys/modules/drm2/i915kms/Makefile
@@ -48,7 +48,6 @@ SRCS	+= i915_ioc32.c
 
 SRCS	+=								\
 	opt_acpi.h							\
-	opt_compat.h							\
 	opt_drm.h							\
 	opt_syscons.h							\
 	acpi_if.h							\
diff --git a/sys/modules/drm2/radeonkms/Makefile b/sys/modules/drm2/radeonkms/Makefile
index 68b030cbc8e3..ef50e70a60de 100644
--- a/sys/modules/drm2/radeonkms/Makefile
+++ b/sys/modules/drm2/radeonkms/Makefile
@@ -101,7 +101,6 @@ radeon_ioc32=		radeon_ioc32.c
 
 SRCS	+=								\
 	opt_acpi.h							\
-	opt_compat.h							\
 	opt_drm.h							\
 	opt_syscons.h							\
 	acpi_if.h							\
diff --git a/sys/modules/dtrace/dtrace/Makefile b/sys/modules/dtrace/dtrace/Makefile
index 1d603ef0afe8..2cfb84c43150 100644
--- a/sys/modules/dtrace/dtrace/Makefile
+++ b/sys/modules/dtrace/dtrace/Makefile
@@ -30,7 +30,7 @@ SRCS+=		bus_if.h device_if.h vnode_if.h
 DPSRCS+=	assym.inc
 
 # These are needed for assym.inc
-SRCS+=		opt_compat.h opt_kstack_pages.h opt_nfs.h opt_hwpmc_hooks.h
+SRCS+=		opt_kstack_pages.h opt_nfs.h opt_hwpmc_hooks.h
 
 #This is needed for dtrace.c
 SRCS += 	opensolaris_taskq.c
diff --git a/sys/modules/dtrace/dtraceall/Makefile b/sys/modules/dtrace/dtraceall/Makefile
index cf081b9822dd..c331a1f53f0b 100644
--- a/sys/modules/dtrace/dtraceall/Makefile
+++ b/sys/modules/dtrace/dtraceall/Makefile
@@ -3,17 +3,10 @@
 SYSDIR?=	${SRCTOP}/sys
 
 KMOD=		dtraceall
-SRCS=		dtraceall.c opt_compat.h opt_nfs.h
+SRCS=		dtraceall.c opt_nfs.h
 
 CFLAGS+=	-I${SYSDIR}
 
-.if !defined(KERNBUILDDIR)
-.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "mips64"
-opt_compat.h:
-	echo "#define COMPAT_FREEBSD32 1" >> ${.TARGET}
-.endif
-.endif
-
 .include <bsd.kmod.mk>
 
 CFLAGS+=	-include ${SYSDIR}/cddl/compat/opensolaris/sys/debug_compat.h
diff --git a/sys/modules/dtrace/dtraceall/dtraceall.c b/sys/modules/dtrace/dtraceall/dtraceall.c
index b456d2ae48bf..7ac25b85d1cc 100644
--- a/sys/modules/dtrace/dtraceall/dtraceall.c
+++ b/sys/modules/dtrace/dtraceall/dtraceall.c
@@ -34,7 +34,6 @@
 #include <sys/kernel.h>
 #include <sys/module.h>
 #include <sys/errno.h>
-#include "opt_compat.h"
 #include "opt_nfs.h"
 
 static int
diff --git a/sys/modules/dtrace/fasttrap/Makefile b/sys/modules/dtrace/fasttrap/Makefile
index 49c0de8c08d3..d1d303cb8856 100644
--- a/sys/modules/dtrace/fasttrap/Makefile
+++ b/sys/modules/dtrace/fasttrap/Makefile
@@ -5,7 +5,7 @@ SYSDIR?=	${SRCTOP}/sys
 .PATH:		${SYSDIR}/cddl/contrib/opensolaris/uts/common/dtrace
 
 KMOD=		fasttrap
-SRCS=		fasttrap.c fasttrap_isa.c opt_compat.h
+SRCS=		fasttrap.c fasttrap_isa.c
 SRCS+=		vnode_if.h
 
 CFLAGS+=	-I${SYSDIR}/cddl/compat/opensolaris \
diff --git a/sys/modules/filemon/Makefile b/sys/modules/filemon/Makefile
index b0c7cd324610..a85b1bd63dab 100644
--- a/sys/modules/filemon/Makefile
+++ b/sys/modules/filemon/Makefile
@@ -4,6 +4,6 @@
 
 KMOD=	filemon
 SRCS=	${KMOD}.c
-SRCS+=	opt_compat.h vnode_if.h
+SRCS+=	vnode_if.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/hyperv/vmbus/Makefile b/sys/modules/hyperv/vmbus/Makefile
index a9a1ff5b1dee..435106c7e9bd 100644
--- a/sys/modules/hyperv/vmbus/Makefile
+++ b/sys/modules/hyperv/vmbus/Makefile
@@ -18,7 +18,7 @@ SRCS=	hyperv.c \
 SRCS+=	acpi_if.h bus_if.h device_if.h opt_acpi.h pci_if.h pcib_if.h vmbus_if.h
 
 # XXX: for assym.inc
-SRCS+=  opt_kstack_pages.h opt_nfs.h opt_hwpmc_hooks.h opt_compat.h
+SRCS+=  opt_kstack_pages.h opt_nfs.h opt_hwpmc_hooks.h
 .if ${MACHINE_CPUARCH} == "i386"
 SRCS+=	opt_apic.h
 .endif
diff --git a/sys/modules/if_tap/Makefile b/sys/modules/if_tap/Makefile
index 854b57a09f64..0df56f3b105b 100644
--- a/sys/modules/if_tap/Makefile
+++ b/sys/modules/if_tap/Makefile
@@ -5,11 +5,6 @@
 .PATH: ${SRCTOP}/sys/net
 
 KMOD=	if_tap
-SRCS=	if_tap.c opt_compat.h opt_inet.h vnode_if.h
-
-.if !defined(KERNBUILDDIR)
-opt_compat.h:
-	echo "#define COMPAT_FREEBSD6 1" > ${.TARGET}
-.endif
+SRCS=	if_tap.c opt_inet.h vnode_if.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/isp/Makefile b/sys/modules/isp/Makefile
index bb13bdfebc19..d59d54036be6 100644
--- a/sys/modules/isp/Makefile
+++ b/sys/modules/isp/Makefile
@@ -4,7 +4,7 @@
 
 KMOD=	isp
 SRCS=	bus_if.h device_if.h pci_if.h \
-	opt_cam.h opt_compat.h opt_ddb.h opt_isp.h \
+	opt_cam.h opt_ddb.h opt_isp.h \
 	isp.c isp_library.c isp_target.c isp_freebsd.c isp_pci.c
 
 .if ${MACHINE} == sparc64
diff --git a/sys/modules/kbdmux/Makefile b/sys/modules/kbdmux/Makefile
index 079a779a2df9..7ae37b839347 100644
--- a/sys/modules/kbdmux/Makefile
+++ b/sys/modules/kbdmux/Makefile
@@ -4,13 +4,10 @@
 .PATH: ${SRCTOP}/sys/dev/kbdmux
 
 KMOD=	kbdmux
-SRCS=	kbdmux.c opt_compat.h opt_evdev.h opt_kbd.h opt_kbdmux.h bus_if.h \
+SRCS=	kbdmux.c opt_evdev.h opt_kbd.h opt_kbdmux.h bus_if.h \
 	device_if.h
 
 .if !defined(KERNBUILDDIR)
-opt_compat.h:
-	echo "#define COMPAT_FREEBSD6 1" > ${.TARGET}
-
 opt_kbd.h:
 	echo "#define KBD_INSTALL_CDEV 1" > ${.TARGET}
 .endif
diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile
index 3cfe8c490507..4055fcb3c8ad 100644
--- a/sys/modules/linux/Makefile
+++ b/sys/modules/linux/Makefile
@@ -22,7 +22,7 @@ SRCS=	linux_fork.c linux${SFX}_dummy.c linux_file.c linux_event.c \
 DPSRCS=	assym.inc linux${SFX}_genassym.c
 
 # XXX: for assym.inc
-SRCS+=  opt_kstack_pages.h opt_nfs.h opt_compat.h opt_hwpmc_hooks.h
+SRCS+=  opt_kstack_pages.h opt_nfs.h opt_hwpmc_hooks.h
 .if ${MACHINE_CPUARCH} == "i386"
 SRCS+=	opt_apic.h
 .endif
diff --git a/sys/modules/linux64/Makefile b/sys/modules/linux64/Makefile
index 88271117ad97..78dbd945a3ec 100644
--- a/sys/modules/linux64/Makefile
+++ b/sys/modules/linux64/Makefile
@@ -10,7 +10,7 @@ SRCS=	linux_fork.c linux_dummy.c linux_file.c linux_event.c \
 	linux_machdep.c linux_misc.c linux_ptrace.c linux_signal.c \
 	linux_socket.c linux_stats.c linux_sysctl.c linux_sysent.c \
 	linux_sysvec.c linux_time.c linux_vdso.c linux_timer.c \
-	opt_inet6.h opt_compat.h opt_posix.h opt_usb.h \
+	opt_compat.h opt_inet6.h opt_posix.h opt_usb.h \
 	vnode_if.h device_if.h bus_if.h \
 	linux_support.s
 DPSRCS=	assym.inc linux_genassym.c
diff --git a/sys/modules/linux_common/Makefile b/sys/modules/linux_common/Makefile
index 87db489fdd9a..940db596a9fe 100644
--- a/sys/modules/linux_common/Makefile
+++ b/sys/modules/linux_common/Makefile
@@ -5,7 +5,7 @@
 KMOD=	linux_common
 SRCS=	linux_common.c linux_mib.c linux_mmap.c linux_util.c linux_emul.c \
 	linux_errno.c \
-	linux.c opt_compat.h device_if.h vnode_if.h bus_if.h
+	linux.c device_if.h vnode_if.h bus_if.h
 
 EXPORT_SYMS=
 EXPORT_SYMS+=	linux_emul_path
diff --git a/sys/modules/mfi/Makefile b/sys/modules/mfi/Makefile
index cfe4aee98268..53f4164add7b 100644
--- a/sys/modules/mfi/Makefile
+++ b/sys/modules/mfi/Makefile
@@ -10,7 +10,7 @@ SUBDIR+= mfi_linux
 
 KMOD=	mfi
 SRCS=	mfi.c mfi_pci.c mfi_disk.c mfi_debug.c mfi_syspd.c mfi_tbolt.c
-SRCS+=	opt_mfi.h opt_cam.h opt_compat.h
+SRCS+=	opt_mfi.h opt_cam.h
 SRCS+=	device_if.h bus_if.h pci_if.h
 
 #CFLAGS += -DMFI_DEBUG
diff --git a/sys/modules/mpr/Makefile b/sys/modules/mpr/Makefile
index 89c1e832fcff..09830c41a86e 100644
--- a/sys/modules/mpr/Makefile
+++ b/sys/modules/mpr/Makefile
@@ -5,7 +5,7 @@
 KMOD=	mpr
 SRCS=	mpr_pci.c mpr.c mpr_sas.c mpr_table.c mpr_user.c
 SRCS+=	mpr_config.c mpr_mapping.c mpr_sas_lsi.c
-SRCS+=	opt_cam.h opt_compat.h
+SRCS+=	opt_cam.h
 SRCS+=	device_if.h bus_if.h pci_if.h
 
 #CFLAGS += -DMPR_DEBUG
diff --git a/sys/modules/mps/Makefile b/sys/modules/mps/Makefile
index 4ac01dffb3df..85f450c1defc 100644
--- a/sys/modules/mps/Makefile
+++ b/sys/modules/mps/Makefile
@@ -5,7 +5,7 @@
 KMOD=	mps
 SRCS=	mps_pci.c mps.c mps_sas.c mps_table.c mps_user.c
 SRCS+=	mps_config.c mps_mapping.c mps_sas_lsi.c
-SRCS+=	opt_cam.h opt_compat.h
+SRCS+=	opt_cam.h
 SRCS+=	device_if.h bus_if.h pci_if.h
 
 #CFLAGS += -DMPS_DEBUG
diff --git a/sys/modules/mqueue/Makefile b/sys/modules/mqueue/Makefile
index 9c8bd6d0b39b..865a543d8c29 100644
--- a/sys/modules/mqueue/Makefile
+++ b/sys/modules/mqueue/Makefile
@@ -5,6 +5,6 @@
 KMOD=	mqueuefs
 SRCS=	uipc_mqueue.c \
 	vnode_if.h \
-	opt_posix.h opt_compat.h opt_capsicum.h
+	opt_posix.h opt_capsicum.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/procfs/Makefile b/sys/modules/procfs/Makefile
index baccfae503ed..5a819e2cae4b 100644
--- a/sys/modules/procfs/Makefile
+++ b/sys/modules/procfs/Makefile
@@ -4,7 +4,6 @@
 
 KMOD=		procfs
 SRCS=
-SRCS+=		opt_compat.h
 SRCS+=		vnode_if.h
 SRCS+=		procfs_dbregs.c
 SRCS+=		procfs_fpregs.c
@@ -27,16 +26,4 @@ EXPORT_SYMS+=	procfs_doprocfile
 EXPORT_SYMS+=	procfs_doprocmem
 EXPORT_SYMS+=	procfs_notsystem
 
-.if !defined(KERNBUILDDIR)
-opt_compat.h:
-	echo "#define COMPAT_43 1" > ${.TARGET}
-	echo "#define COMPAT_FREEBSD4 1" >> ${.TARGET}
-	echo "#define COMPAT_FREEBSD5 1" >> ${.TARGET}
-	echo "#define COMPAT_FREEBSD6 1" >> ${.TARGET}
-.if ${MACHINE_CPUARCH} == "amd64"
-	echo "#define COMPAT_FREEBSD32 1" >> ${.TARGET}
-	echo "#define COMPAT_LINUX32 1" >> ${.TARGET}
-.endif
-.endif
-
 .include <bsd.kmod.mk>
diff --git a/sys/modules/rp/Makefile b/sys/modules/rp/Makefile
index a766394c568a..530fc12898ce 100644
--- a/sys/modules/rp/Makefile
+++ b/sys/modules/rp/Makefile
@@ -3,11 +3,6 @@
 .PATH: ${SRCTOP}/sys/dev/rp
 
 KMOD=	rp
-SRCS=	rp.c rp_pci.c device_if.h bus_if.h pci_if.h opt_compat.h
-
-.if !defined(KERNBUILDDIR)
-opt_compat.h:
-	echo "#define COMPAT_43 1" > ${.TARGET}
-.endif
+SRCS=	rp.c rp_pci.c device_if.h bus_if.h pci_if.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/sem/Makefile b/sys/modules/sem/Makefile
index c5457e14e438..5a541a00cb4c 100644
--- a/sys/modules/sem/Makefile
+++ b/sys/modules/sem/Makefile
@@ -3,6 +3,6 @@
 .PATH: ${SRCTOP}/sys/kern
 
 KMOD=	sem
-SRCS=	uipc_sem.c opt_compat.h opt_posix.h vnode_if.h
+SRCS=	uipc_sem.c opt_posix.h vnode_if.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/sgx/Makefile b/sys/modules/sgx/Makefile
index ea9481ccc3f8..7e2a2f87b33a 100644
--- a/sys/modules/sgx/Makefile
+++ b/sys/modules/sgx/Makefile
@@ -4,7 +4,7 @@
 
 KMOD=	sgx
 SRCS=	sgx.c sgxvar.h sgx_support.S
-SRCS+=	opt_compat.h opt_hwpmc_hooks.h opt_kstack_pages.h
+SRCS+=	opt_hwpmc_hooks.h opt_kstack_pages.h
 DPSRCS=	assym.inc
 
 sgx_support.o:  assym.inc
diff --git a/sys/modules/sio/Makefile b/sys/modules/sio/Makefile
index 5f3c4beb8e83..48fdfc88ebec 100644
--- a/sys/modules/sio/Makefile
+++ b/sys/modules/sio/Makefile
@@ -4,12 +4,7 @@
 
 KMOD=	sio
 SRCS=	bus_if.h card_if.h device_if.h isa_if.h pci_if.h serdev_if.h \
-	opt_compat.h opt_gdb.h opt_kdb.h opt_sio.h \
+	opt_gdb.h opt_kdb.h opt_sio.h \
 	sio.c sio_isa.c sio_pccard.c sio_pci.c sio_puc.c pccarddevs.h
 
-.if !defined(KERNBUILDDIR)
-opt_compat.h:
-	echo "#define COMPAT_43 1" > ${.TARGET}
-.endif
-
 .include <bsd.kmod.mk>
diff --git a/sys/modules/sysvipc/sysvmsg/Makefile b/sys/modules/sysvipc/sysvmsg/Makefile
index c30ecac1f5bd..8cd9d2008b9a 100644
--- a/sys/modules/sysvipc/sysvmsg/Makefile
+++ b/sys/modules/sysvipc/sysvmsg/Makefile
@@ -3,6 +3,6 @@
 .PATH: ${SRCTOP}/sys/kern
 
 KMOD=	sysvmsg
-SRCS=	sysv_msg.c opt_sysvipc.h opt_compat.h
+SRCS=	sysv_msg.c opt_sysvipc.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/sysvipc/sysvsem/Makefile b/sys/modules/sysvipc/sysvsem/Makefile
index 37d31b22f46b..186e7ed94f4b 100644
--- a/sys/modules/sysvipc/sysvsem/Makefile
+++ b/sys/modules/sysvipc/sysvsem/Makefile
@@ -3,6 +3,6 @@
 .PATH: ${SRCTOP}/sys/kern
 
 KMOD=	sysvsem
-SRCS=	sysv_sem.c opt_sysvipc.h opt_compat.h
+SRCS=	sysv_sem.c opt_sysvipc.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/sysvipc/sysvshm/Makefile b/sys/modules/sysvipc/sysvshm/Makefile
index 3ca31d602d5c..672079706587 100644
--- a/sys/modules/sysvipc/sysvshm/Makefile
+++ b/sys/modules/sysvipc/sysvshm/Makefile
@@ -3,6 +3,6 @@
 .PATH: ${SRCTOP}/sys/kern
 
 KMOD=	sysvshm
-SRCS=	sysv_shm.c opt_sysvipc.h opt_compat.h
+SRCS=	sysv_shm.c opt_sysvipc.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/usb/ukbd/Makefile b/sys/modules/usb/ukbd/Makefile
index bbd721a0a513..e9c4c80d68fb 100644
--- a/sys/modules/usb/ukbd/Makefile
+++ b/sys/modules/usb/ukbd/Makefile
@@ -30,7 +30,7 @@ S=     ${SRCTOP}/sys
 .PATH: $S/dev/usb/input
 
 KMOD=	ukbd
-SRCS=	opt_bus.h opt_compat.h opt_evdev.h opt_kbd.h opt_ukbd.h opt_usb.h \
+SRCS=	opt_bus.h opt_evdev.h opt_kbd.h opt_ukbd.h opt_usb.h \
 	device_if.h bus_if.h usb_if.h usbdevs.h \
 	ukbd.c
 
diff --git a/sys/modules/vkbd/Makefile b/sys/modules/vkbd/Makefile
index 250653b4f6cf..00654c1136eb 100644
--- a/sys/modules/vkbd/Makefile
+++ b/sys/modules/vkbd/Makefile
@@ -4,12 +4,9 @@
 .PATH:	${SRCTOP}/sys/dev/vkbd
 
 KMOD=	vkbd
-SRCS=	vkbd.c opt_compat.h opt_kbd.h
+SRCS=	vkbd.c opt_kbd.h
 
 .if !defined(KERNBUILDDIR)
-opt_compat.h:
-	echo "#define COMPAT_FREEBSD6 1" > ${.TARGET}
-
 opt_kbd.h:
 	echo "#define KBD_INSTALL_CDEV 1" > ${.TARGET}
 .endif