From 71853f41815a6fdc1aa64a502d06264cbb8d2f6a Mon Sep 17 00:00:00 2001 From: ngie Date: Mon, 1 Aug 2016 06:59:35 +0000 Subject: [PATCH] MFC r288071: - arm64 change was omitted due to lack of architecture support - ia64 change was added as the architecture was removed from ^/head Sponsored by: EMC / Isilon Storage Division r288071 (by emaste): Move kbd.c to main sys/conf/files list It is (optionally) used on all architectures. git-svn-id: svn://svn.freebsd.org/base/stable/10@303609 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- sys/conf/files | 1 + sys/conf/files.amd64 | 1 - sys/conf/files.arm | 1 - sys/conf/files.i386 | 1 - sys/conf/files.ia64 | 1 - sys/conf/files.mips | 1 - sys/conf/files.pc98 | 1 - sys/conf/files.powerpc | 1 - sys/conf/files.sparc64 | 1 - 9 files changed, 1 insertion(+), 8 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index d35f86168..2677f5c95 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1782,6 +1782,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 2adb9bf17..484355aee 100644 --- a/sys/conf/files.amd64 +++ b/sys/conf/files.amd64 @@ -281,7 +281,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 ecb7f85d5..0d3000d36 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 03d5ee0cd..56ce492b8 100644 --- a/sys/conf/files.i386 +++ b/sys/conf/files.i386 @@ -274,7 +274,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 79caeafab..566cd9e13 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 6522bb20f..148fcf932 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 598743a10..533c58e80 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 771968a16..cde549001 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 d62a8936d..5099ff432 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 -- 2.45.0