svn commit: r351051 - head/sys/conf

[Warner Losh]

Author: imp
Date: Wed Aug 14 20:58:39 2019
New Revision: 351051
URL: https://svnweb.freebsd.org/changeset/base/351051

Log:
  Windows ndis support is x86 only. Move the MI parts there.
  
  Reviewed by: jhb (verbal OK on irc)
  Differential Revision: https://reviews.freebsd.org/D21248

Modified:
  head/sys/conf/files.amd64
  head/sys/conf/files.i386
  head/sys/conf/files.x86

Modified: head/sys/conf/files.amd64
==============================================================================
--- head/sys/conf/files.amd64	Wed Aug 14 20:58:34 2019	(r351050)
+++ head/sys/conf/files.amd64	Wed Aug 14 20:58:39 2019	(r351051)
@@ -444,16 +444,6 @@ compat/linux/linux_event.c	optional	compat_linux32
 compat/linux/linux.c		optional	compat_linux32
 dev/amr/amr_linux.c		optional	compat_linux32 amr
 dev/mfi/mfi_linux.c		optional	compat_linux32 mfi
-#
-# Windows NDIS driver support
-#
-compat/ndis/kern_ndis.c		optional	ndisapi pci
-compat/ndis/kern_windrv.c	optional	ndisapi pci
-compat/ndis/subr_hal.c		optional	ndisapi pci
-compat/ndis/subr_ndis.c		optional	ndisapi pci
-compat/ndis/subr_ntoskrnl.c	optional	ndisapi pci
-compat/ndis/subr_pe.c		optional	ndisapi pci
-compat/ndis/subr_usbd.c		optional	ndisapi pci
 compat/ndis/winx64_wrap.S	optional	ndisapi pci
 #
 # x86 real mode BIOS emulator, required by dpms/pci/vesa

Modified: head/sys/conf/files.i386
==============================================================================
--- head/sys/conf/files.i386	Wed Aug 14 20:58:34 2019	(r351050)
+++ head/sys/conf/files.i386	Wed Aug 14 20:58:39 2019	(r351051)
@@ -84,13 +84,6 @@ compat/linux/linux_uid16.c	optional compat_linux
 compat/linux/linux_util.c	optional compat_linux
 compat/linux/linux_vdso.c	optional compat_linux
 compat/linux/linux.c		optional compat_linux
-compat/ndis/kern_ndis.c		optional ndisapi pci
-compat/ndis/kern_windrv.c	optional ndisapi pci
-compat/ndis/subr_hal.c		optional ndisapi pci
-compat/ndis/subr_ndis.c		optional ndisapi pci
-compat/ndis/subr_ntoskrnl.c	optional ndisapi pci
-compat/ndis/subr_pe.c		optional ndisapi pci
-compat/ndis/subr_usbd.c		optional ndisapi pci
 compat/ndis/winx32_wrap.S	optional ndisapi pci
 bf_enc.o			optional crypto | ipsec	| ipsec_support \
 	dependency	"$S/crypto/blowfish/arch/i386/bf_enc.S $S/crypto/blowfish/arch/i386/bf_enc_586.S $S/crypto/blowfish/arch/i386/bf_enc_686.S" \

Modified: head/sys/conf/files.x86
==============================================================================
--- head/sys/conf/files.x86	Wed Aug 14 20:58:34 2019	(r351050)
+++ head/sys/conf/files.x86	Wed Aug 14 20:58:39 2019	(r351051)
@@ -20,6 +20,13 @@ cddl/dev/dtrace/x86/instr_size.c			optional dtrace_fbt
 cddl/dev/fbt/x86/fbt_isa.c				optional dtrace_fbt | dtraceall compile-with "${FBT_C}"
 cddl/dev/dtrace/x86/dis_tables.c			optional dtrace_fbt | dtraceall compile-with "${DTRACE_C}"
 cddl/dev/dtrace/x86/instr_size.c			optional dtrace_fbt | dtraceall compile-with "${DTRACE_C}"
+compat/ndis/kern_ndis.c		optional ndisapi pci
+compat/ndis/kern_windrv.c	optional ndisapi pci
+compat/ndis/subr_hal.c		optional ndisapi pci
+compat/ndis/subr_ndis.c		optional ndisapi pci
+compat/ndis/subr_ntoskrnl.c	optional ndisapi pci
+compat/ndis/subr_pe.c		optional ndisapi pci
+compat/ndis/subr_usbd.c		optional ndisapi pci
 crypto/aesni/aesni.c		optional aesni
 aesni_ghash.o			optional aesni				\
 	dependency	"$S/crypto/aesni/aesni_ghash.c"			\