forgot to merge NETMAP entries in sys/conf !

This commit is contained in:
Luigi Rizzo 2011-11-22 21:50:38 +00:00
parent a9029fbb59
commit e4b68814b1
3 changed files with 8 additions and 0 deletions

View File

@ -799,6 +799,12 @@ device sppp
# option. DHCP requires bpf.
device bpf
# The `netmap' device implements memory-mapped access to network
# devices from userspace, enabling wire-speed packet capture and
# generation even at 10Gbit/s. Requires support in the device
# driver. Supported drivers are ixgbe, e1000, re.
device netmap
# The `disc' device implements a minimal network interface,
# which throws away all packets sent and never receives any. It is
# included for testing and benchmarking purposes.

View File

@ -1507,6 +1507,7 @@ dev/mxge/mxge_rss_ethp_z8e.c optional mxge pci
dev/my/if_my.c optional my
dev/ncv/ncr53c500.c optional ncv
dev/ncv/ncr53c500_pccard.c optional ncv pccard
dev/netmap/netmap.c optional netmap
dev/nge/if_nge.c optional nge
dev/nxge/if_nxge.c optional nxge
dev/nxge/xgehal/xgehal-device.c optional nxge

View File

@ -690,6 +690,7 @@ ISAPNP opt_isa.h
# various 'device presence' options.
DEV_BPF opt_bpf.h
DEV_NETMAP opt_global.h
DEV_MCA opt_mca.h
DEV_CARP opt_carp.h
DEV_SPLASH opt_splash.h