aboutsummaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/amd64/conf/NOTES3
-rw-r--r--sys/boot/forth/loader.conf1
-rw-r--r--sys/conf/files.amd642
-rw-r--r--sys/conf/files.i3862
-rw-r--r--sys/i386/conf/NOTES3
-rw-r--r--sys/pc98/conf/NOTES3
-rw-r--r--sys/sys/param.h2
7 files changed, 1 insertions, 15 deletions
diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES
index aa80598cac47..61372f5342bb 100644
--- a/sys/amd64/conf/NOTES
+++ b/sys/amd64/conf/NOTES
@@ -647,8 +647,5 @@ options VM_KMEM_SIZE_SCALE
options NDISAPI
device ndis
-# Linux-specific pseudo devices support
-device lindev
-
# Module to enable execution of application via emulators like QEMU
options IMAGACT_BINMISC
diff --git a/sys/boot/forth/loader.conf b/sys/boot/forth/loader.conf
index 641f95b2f906..3f31b7a8ebec 100644
--- a/sys/boot/forth/loader.conf
+++ b/sys/boot/forth/loader.conf
@@ -241,7 +241,6 @@ screensave_name="green_saver" # Set to the name of the screensaver module
ibcs2_load="NO" # IBCS2 (SCO) emulation
ibcs2_coff_load="NO"
linux_load="NO" # Linux emulation
-lindev_load="NO" # Linux-specific pseudo devices (see lindev(4))
svr4_load="NO" # SystemV R4 emulation
streams_load="NO" # System V streams module
diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64
index f78f1c87bf31..e7d33a800f1c 100644
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
@@ -232,8 +232,6 @@ dev/hyperv/vmbus/hv_hv.c optional hyperv
dev/hyperv/vmbus/hv_ring_buffer.c optional hyperv
dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c optional hyperv
dev/kbd/kbd.c optional atkbd | sc | ukbd | vt
-dev/lindev/full.c optional lindev
-dev/lindev/lindev.c optional lindev
dev/nfe/if_nfe.c optional nfe pci
dev/ntb/if_ntb/if_ntb.c optional if_ntb
dev/ntb/ntb_hw/ntb_hw.c optional if_ntb ntb_hw
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index 30c224a44e1f..b07eebdfd2fa 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -240,8 +240,6 @@ dev/ipmi/ipmi_pci.c optional ipmi pci
dev/ipmi/ipmi_linux.c optional ipmi compat_linux
dev/kbd/kbd.c optional atkbd | sc | ukbd | vt
dev/le/if_le_isa.c optional le isa
-dev/lindev/full.c optional lindev
-dev/lindev/lindev.c optional lindev
dev/mse/mse.c optional mse
dev/mse/mse_isa.c optional mse isa
dev/nfe/if_nfe.c optional nfe pci
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 58787227167a..6ce701c432f9 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -1002,9 +1002,6 @@ device streams # STREAMS network driver (required for svr4).
options NDISAPI
device ndis
-# Linux-specific pseudo devices support
-device lindev
-
#####################################################################
# VM OPTIONS
diff --git a/sys/pc98/conf/NOTES b/sys/pc98/conf/NOTES
index 98a28b1e8a91..5442002cdf13 100644
--- a/sys/pc98/conf/NOTES
+++ b/sys/pc98/conf/NOTES
@@ -545,9 +545,6 @@ options COMPAT_SVR4 # build emulator statically
options DEBUG_SVR4 # enable verbose debugging
device streams # STREAMS network driver (required for svr4).
-# Linux-specific pseudo devices support
-device lindev
-
#####################################################################
# VM OPTIONS
diff --git a/sys/sys/param.h b/sys/sys/param.h
index 92a9d10eb973..0a5616e10dfc 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -58,7 +58,7 @@
* in the range 5 to 9.
*/
#undef __FreeBSD_version
-#define __FreeBSD_version 1100019 /* Master, propagated to newvers */
+#define __FreeBSD_version 1100020 /* Master, propagated to newvers */
/*
* __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,