Module Name:	src
Committed By:	rittera
Date:		Tue Apr 18 16:49:19 UTC 2006

Modified Files:
	src/sys/arch/i386/conf: GENERIC files.i386
	src/sys/dev/if_ndis: if_ndis.c if_ndis_pci.c
	src/sys/dev/pci: files.pci
	src/usr.sbin: Makefile
	src/usr.sbin/ndiscvt: Makefile inf-parse.y inf-token.l inf.c inf.h

Log Message:
A number of minor changes for NDIS.  (OK'd by phil)

1. Removed the makeoptions line from arch/i386/conf/GENERIC.  Now
ndis_driver_data.h is simply copied into the kernel build directory instead
of editing the config file to specify its location.

2. Uncommented lines in files.i386 and files.pci related to NDIS.  NDIS will
not be compiled into the kernel unless the two lines are uncommented from
GENERIC (I checked using nm), so there is no reason for this to be commented
out.

3. Added ndiscvt to usr.sbin/Makefile.


To generate a diff of this commit:
cvs rdiff -r1.743 -r1.744 src/sys/arch/i386/conf/GENERIC
cvs rdiff -r1.285 -r1.286 src/sys/arch/i386/conf/files.i386
cvs rdiff -r1.3 -r1.4 src/sys/dev/if_ndis/if_ndis.c \
    src/sys/dev/if_ndis/if_ndis_pci.c
cvs rdiff -r1.249 -r1.250 src/sys/dev/pci/files.pci
cvs rdiff -r1.212 -r1.213 src/usr.sbin/Makefile
cvs rdiff -r1.2 -r1.3 src/usr.sbin/ndiscvt/Makefile \
    src/usr.sbin/ndiscvt/inf-parse.y src/usr.sbin/ndiscvt/inf-token.l \
    src/usr.sbin/ndiscvt/inf.c
cvs rdiff -r1.1 -r1.2 src/usr.sbin/ndiscvt/inf.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.