Merge remote-tracking branch 'origin/stable/10' into devel

9 files changed, 1 insertions, 8 deletions

diff --git a/sys/conf/files b/sys/conf/files
index 51d9fde..8add482 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1785,6 +1785,7 @@ dev/jme/if_jme.c		optional jme pci
 dev/joy/joy.c			optional joy
 dev/joy/joy_isa.c		optional joy isa
 dev/joy/joy_pccard.c		optional joy pccard
+dev/kbd/kbd.c			optional atkbd | pckbd | sc | ukbd | vt
 dev/kbdmux/kbdmux.c		optional kbdmux
 dev/ksyms/ksyms.c		optional ksyms
 dev/le/am7990.c			optional le
diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64
index e8d9c7d..e6b1e90 100644
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
@@ -286,7 +286,6 @@ dev/hyperv/vmbus/vmbus.c				optional	hyperv
 dev/hyperv/vmbus/vmbus_et.c				optional	hyperv
 dev/hyperv/vmbus/amd64/hyperv_machdep.c			optional	hyperv
 dev/hyperv/vmbus/amd64/vmbus_vector.S			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
diff --git a/sys/conf/files.arm b/sys/conf/files.arm
index ecb7f85..0d3000d 100644
--- a/sys/conf/files.arm
+++ b/sys/conf/files.arm
@@ -66,7 +66,6 @@ crypto/blowfish/bf_enc.c	optional	crypto | ipsec
 crypto/des/des_enc.c		optional	crypto | ipsec | netsmb
 dev/fb/fb.c			optional	sc
 dev/hwpmc/hwpmc_arm.c		optional	hwpmc
-dev/kbd/kbd.c			optional	sc | vt
 dev/syscons/scgfbrndr.c		optional	sc
 dev/syscons/scterm-teken.c	optional	sc
 dev/syscons/scvtb.c		optional	sc
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index 19b44ef..fe93e68 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -279,7 +279,6 @@ dev/ipmi/ipmi_smbios.c		optional ipmi
 dev/ipmi/ipmi_ssif.c		optional ipmi smbus
 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
diff --git a/sys/conf/files.ia64 b/sys/conf/files.ia64
index 79caeaf..566cd9e 100644
--- a/sys/conf/files.ia64
+++ b/sys/conf/files.ia64
@@ -52,7 +52,6 @@ dev/fb/fb.c			optional	fb | vga
 dev/fb/vga.c			optional	vga
 dev/hwpmc/hwpmc_ia64.c		optional	hwpmc
 dev/io/iodev.c			optional	io
-dev/kbd/kbd.c			optional	atkbd | sc | ukbd
 dev/syscons/scterm-teken.c	optional	sc
 dev/syscons/scvgarndr.c		optional	sc vga
 dev/syscons/scvtb.c		optional	sc
diff --git a/sys/conf/files.mips b/sys/conf/files.mips
index 6522bb2..148fcf9 100644
--- a/sys/conf/files.mips
+++ b/sys/conf/files.mips
@@ -68,7 +68,6 @@ dev/cfe/cfe_env.c			optional	cfe_env
 
 # syscons support
 dev/fb/fb.c				optional	sc
-dev/kbd/kbd.c				optional	sc
 dev/syscons/scgfbrndr.c			optional	sc
 dev/syscons/scterm-teken.c		optional	sc
 dev/syscons/scvtb.c			optional	sc
diff --git a/sys/conf/files.pc98 b/sys/conf/files.pc98
index 598743a..533c58e 100644
--- a/sys/conf/files.pc98
+++ b/sys/conf/files.pc98
@@ -126,7 +126,6 @@ dev/hwpmc/hwpmc_ppro.c		optional hwpmc
 dev/hwpmc/hwpmc_tsc.c		optional hwpmc
 dev/hwpmc/hwpmc_x86.c		optional hwpmc
 dev/io/iodev.c			optional io
-dev/kbd/kbd.c			optional pckbd | sc | ukbd
 dev/le/if_le_cbus.c		optional le isa
 dev/lindev/full.c		optional lindev
 dev/lindev/lindev.c		optional lindev
diff --git a/sys/conf/files.powerpc b/sys/conf/files.powerpc
index 771968a..cde5490 100644
--- a/sys/conf/files.powerpc
+++ b/sys/conf/files.powerpc
@@ -39,7 +39,6 @@ dev/iicbus/adt746x.c		optional        adt746x powermac
 dev/iicbus/ds1631.c		optional	ds1631 powermac
 dev/iicbus/ds1775.c		optional	ds1775 powermac
 dev/iicbus/max6690.c		optional	max6690 powermac
-dev/kbd/kbd.c			optional	sc | vt
 dev/nand/nfc_fsl.c		optional	nand mpc85xx
 # ofw can be either aim or fdt: fdt case handled in files. aim only powerpc specific.
 dev/ofw/openfirm.c		optional	aim
diff --git a/sys/conf/files.sparc64 b/sys/conf/files.sparc64
index d62a893..5099ff4 100644
--- a/sys/conf/files.sparc64
+++ b/sys/conf/files.sparc64
@@ -40,7 +40,6 @@ dev/fb/fb.c			optional	sc
 dev/fb/gallant12x22.c		optional	sc
 dev/fb/machfb.c			optional	machfb sc
 dev/hwpmc/hwpmc_sparc64.c	optional	hwpmc
-dev/kbd/kbd.c			optional	atkbd | sc | ukbd | vt
 dev/le/if_le_lebuffer.c		optional	le sbus
 dev/le/if_le_ledma.c		optional	le sbus
 dev/le/lebuffer_sbus.c		optional	le sbus