Attachment #147561 for bug #193824

Lines 2095-2102 device em # Intel Pro/1000 Gigabit Ethernet Link Here

(-)sys/conf/NOTES (-2 lines)
2095	device igb # Intel Pro/1000 PCIE Gigabit Ethernet	2095	device igb # Intel Pro/1000 PCIE Gigabit Ethernet
2096	device ixgb # Intel Pro/10Gbe PCI-X Ethernet	2096	device ixgb # Intel Pro/10Gbe PCI-X Ethernet
2097	device ixgbe # Intel Pro/10Gbe PCIE Ethernet	2097	device ixgbe # Intel Pro/10Gbe PCIE Ethernet
2098	device ixl # Intel XL710 40Gbe PCIE Ethernet
2099	device ixlv # Intel XL710 40Gbe VF PCIE Ethernet
2100	device le # AMD Am7900 LANCE and Am79C9xx PCnet	2098	device le # AMD Am7900 LANCE and Am79C9xx PCnet
2101	device mxge # Myricom Myri-10G 10GbE NIC	2099	device mxge # Myricom Myri-10G 10GbE NIC
2102	device nxge # Neterion Xframe 10GbE Server/Storage Adapter	2100	device nxge # Neterion Xframe 10GbE Server/Storage Adapter




dev/hwpmc/hwpmc_logging.c	optional hwpmc
dev/hwpmc/hwpmc_mod.c		optional hwpmc
dev/hwpmc/hwpmc_soft.c		optional hwpmc
dev/ixl/if_ixl.c		optional ixl inet \
	compile-with "${NORMAL_C} -I$S/dev/ixl"
dev/ixl/if_ixlv.c		optional ixlv inet \
	compile-with "${NORMAL_C} -I$S/dev/ixl"
dev/ixl/ixlvc.c			optional ixlv inet \
	compile-with "${NORMAL_C} -I$S/dev/ixl"
dev/ixl/ixl_txrx.c		optional ixl ixlv inet \
	compile-with "${NORMAL_C} -I$S/dev/ixl"
dev/ixl/i40e_osdep.c		optional ixl ixlv inet \
	compile-with "${NORMAL_C} -I$S/dev/ixl"
dev/ixl/i40e_lan_hmc.c		optional ixl ixlv inet \
	compile-with "${NORMAL_C} -I$S/dev/ixl"
dev/ixl/i40e_hmc.c		optional ixl ixlv inet \
	compile-with "${NORMAL_C} -I$S/dev/ixl"
dev/ixl/i40e_common.c		optional ixl ixlv inet \
	compile-with "${NORMAL_C} -I$S/dev/ixl"
dev/ixl/i40e_nvm.c		optional ixl ixlv inet \
	compile-with "${NORMAL_C} -I$S/dev/ixl"
dev/ixl/i40e_adminq.c		optional ixl ixlv inet \
	compile-with "${NORMAL_C} -I$S/dev/ixl"
dev/ichsmb/ichsmb.c		optional ichsmb
dev/ichsmb/ichsmb_pci.c		optional ichsmb pci
dev/ida/ida.c			optional ida




dev/ipmi/ipmi_ssif.c		optional	ipmi smbus
dev/ipmi/ipmi_pci.c		optional	ipmi pci
dev/ipmi/ipmi_linux.c		optional	ipmi compat_linux32
dev/ixl/if_ixl.c		optional	ixl pci \
	compile-with "${NORMAL_C} -I$S/dev/ixl"
dev/ixl/if_ixlv.c		optional	ixlv pci \
	compile-with "${NORMAL_C} -I$S/dev/ixl"
dev/ixl/ixlvc.c			optional	ixlv pci \
	compile-with "${NORMAL_C} -I$S/dev/ixl"
dev/ixl/ixl_txrx.c		optional	ixl pci | ixlv pci \
	compile-with "${NORMAL_C} -I$S/dev/ixl"
dev/ixl/i40e_osdep.c		optional	ixl pci | ixlv pci \
	compile-with "${NORMAL_C} -I$S/dev/ixl"
dev/ixl/i40e_lan_hmc.c		optional	ixl pci | ixlv pci \
	compile-with "${NORMAL_C} -I$S/dev/ixl"
dev/ixl/i40e_hmc.c		optional	ixl pci | ixlv pci \
	compile-with "${NORMAL_C} -I$S/dev/ixl"
dev/ixl/i40e_common.c		optional	ixl pci | ixlv pci \
	compile-with "${NORMAL_C} -I$S/dev/ixl"
dev/ixl/i40e_nvm.c		optional	ixl pci | ixlv pci \
	compile-with "${NORMAL_C} -I$S/dev/ixl"
dev/ixl/i40e_adminq.c		optional	ixl pci | ixlv pci \
	compile-with "${NORMAL_C} -I$S/dev/ixl"
dev/fdc/fdc.c			optional	fdc
dev/fdc/fdc_acpi.c		optional	fdc
dev/fdc/fdc_isa.c		optional	fdc isa

Lines 216-221 device de # DEC/Intel DC21x4x (``Tulip'') Link Here

(-)sys/amd64/conf/GENERIC (+2 lines)
216	device em # Intel PRO/1000 Gigabit Ethernet Family	216	device em # Intel PRO/1000 Gigabit Ethernet Family
217	device igb # Intel PRO/1000 PCIE Server Gigabit Family	217	device igb # Intel PRO/1000 PCIE Server Gigabit Family
218	device ixgbe # Intel PRO/10GbE PCIE Ethernet Family	218	device ixgbe # Intel PRO/10GbE PCIE Ethernet Family
		219	device ixl # Intel XL710 40Gbe PCIE Ethernet
		220	device ixlv # Intel XL710 40Gbe VF PCIE Ethernet
219	device le # AMD Am7900 LANCE and Am79C9xx PCnet	221	device le # AMD Am7900 LANCE and Am79C9xx PCnet
220	device ti # Alteon Networks Tigon I/II gigabit Ethernet	222	device ti # Alteon Networks Tigon I/II gigabit Ethernet
221	device txp # 3Com 3cR990 (``Typhoon'')	223	device txp # 3Com 3cR990 (``Typhoon'')

Lines 624-631 _iwnfw= iwnfw Link Here

(-)sys/modules/Makefile (-2 lines)
624	.endif	624	.endif
625	_ixgb= ixgb	625	_ixgb= ixgb
626	_ixgbe= ixgbe	626	_ixgbe= ixgbe
627	_ixl= ixl
628	_ixlv= ixlv
629	_mly= mly	627	_mly= mly
630	_nfe= nfe	628	_nfe= nfe
631	_nvd= nvd	629	_nvd= nvd

Return to bug 193824

Lines 1430-1455 dev/hptiop/hptiop.c optional hptiop scbus Link Here

(-)sys/conf/files (-20 lines)
1430	dev/hwpmc/hwpmc_logging.c optional hwpmc	1430	dev/hwpmc/hwpmc_logging.c optional hwpmc
1431	dev/hwpmc/hwpmc_mod.c optional hwpmc	1431	dev/hwpmc/hwpmc_mod.c optional hwpmc
1432	dev/hwpmc/hwpmc_soft.c optional hwpmc	1432	dev/hwpmc/hwpmc_soft.c optional hwpmc
1433	dev/ixl/if_ixl.c optional ixl inet \
1434	compile-with "${NORMAL_C} -I$S/dev/ixl"
1435	dev/ixl/if_ixlv.c optional ixlv inet \
1436	compile-with "${NORMAL_C} -I$S/dev/ixl"
1437	dev/ixl/ixlvc.c optional ixlv inet \
1438	compile-with "${NORMAL_C} -I$S/dev/ixl"
1439	dev/ixl/ixl_txrx.c optional ixl ixlv inet \
1440	compile-with "${NORMAL_C} -I$S/dev/ixl"
1441	dev/ixl/i40e_osdep.c optional ixl ixlv inet \
1442	compile-with "${NORMAL_C} -I$S/dev/ixl"
1443	dev/ixl/i40e_lan_hmc.c optional ixl ixlv inet \
1444	compile-with "${NORMAL_C} -I$S/dev/ixl"
1445	dev/ixl/i40e_hmc.c optional ixl ixlv inet \
1446	compile-with "${NORMAL_C} -I$S/dev/ixl"
1447	dev/ixl/i40e_common.c optional ixl ixlv inet \
1448	compile-with "${NORMAL_C} -I$S/dev/ixl"
1449	dev/ixl/i40e_nvm.c optional ixl ixlv inet \
1450	compile-with "${NORMAL_C} -I$S/dev/ixl"
1451	dev/ixl/i40e_adminq.c optional ixl ixlv inet \
1452	compile-with "${NORMAL_C} -I$S/dev/ixl"
1453	dev/ichsmb/ichsmb.c optional ichsmb	1433	dev/ichsmb/ichsmb.c optional ichsmb
1454	dev/ichsmb/ichsmb_pci.c optional ichsmb pci	1434	dev/ichsmb/ichsmb_pci.c optional ichsmb pci
1455	dev/ida/ida.c optional ida	1435	dev/ida/ida.c optional ida

Lines 192-197 dev/ipmi/ipmi_smbios.c optional ipmi Link Here

(-)sys/conf/files.amd64 (+20 lines)
192	dev/ipmi/ipmi_ssif.c optional ipmi smbus	192	dev/ipmi/ipmi_ssif.c optional ipmi smbus
193	dev/ipmi/ipmi_pci.c optional ipmi pci	193	dev/ipmi/ipmi_pci.c optional ipmi pci
194	dev/ipmi/ipmi_linux.c optional ipmi compat_linux32	194	dev/ipmi/ipmi_linux.c optional ipmi compat_linux32
		195	dev/ixl/if_ixl.c optional ixl pci \
		196	compile-with "${NORMAL_C} -I$S/dev/ixl"
		197	dev/ixl/if_ixlv.c optional ixlv pci \
		198	compile-with "${NORMAL_C} -I$S/dev/ixl"
		199	dev/ixl/ixlvc.c optional ixlv pci \
		200	compile-with "${NORMAL_C} -I$S/dev/ixl"
		201	dev/ixl/ixl_txrx.c optional ixl pci \| ixlv pci \
		202	compile-with "${NORMAL_C} -I$S/dev/ixl"
		203	dev/ixl/i40e_osdep.c optional ixl pci \| ixlv pci \
		204	compile-with "${NORMAL_C} -I$S/dev/ixl"
		205	dev/ixl/i40e_lan_hmc.c optional ixl pci \| ixlv pci \
		206	compile-with "${NORMAL_C} -I$S/dev/ixl"
		207	dev/ixl/i40e_hmc.c optional ixl pci \| ixlv pci \
		208	compile-with "${NORMAL_C} -I$S/dev/ixl"
		209	dev/ixl/i40e_common.c optional ixl pci \| ixlv pci \
		210	compile-with "${NORMAL_C} -I$S/dev/ixl"
		211	dev/ixl/i40e_nvm.c optional ixl pci \| ixlv pci \
		212	compile-with "${NORMAL_C} -I$S/dev/ixl"
		213	dev/ixl/i40e_adminq.c optional ixl pci \| ixlv pci \
		214	compile-with "${NORMAL_C} -I$S/dev/ixl"
195	dev/fdc/fdc.c optional fdc	215	dev/fdc/fdc.c optional fdc
196	dev/fdc/fdc_acpi.c optional fdc	216	dev/fdc/fdc_acpi.c optional fdc
197	dev/fdc/fdc_isa.c optional fdc isa	217	dev/fdc/fdc_isa.c optional fdc isa

Lines 310-315 options DRM_DEBUG # Include debug printfs (slow) Link Here

(-)sys/amd64/conf/NOTES (+4 lines)
310	# iwn: Intel Wireless WiFi Link 1000/105/135/2000/4965/5000/6000/6050 abgn	310	# iwn: Intel Wireless WiFi Link 1000/105/135/2000/4965/5000/6000/6050 abgn
311	# 802.11 network adapters	311	# 802.11 network adapters
312	# Requires the iwn firmware module	312	# Requires the iwn firmware module
		313	# ixl: Intel XL710 40Gbe PCIE Ethernet
		314	# ixlv: Intel XL710 40Gbe VF PCIE Ethernet
313	# mlx4ib: Mellanox ConnectX HCA InfiniBand	315	# mlx4ib: Mellanox ConnectX HCA InfiniBand
314	# mlxen: Mellanox ConnectX HCA Ethernet	316	# mlxen: Mellanox ConnectX HCA Ethernet
315	# mthca: Mellanox HCA InfiniBand	317	# mthca: Mellanox HCA InfiniBand
Lines 327-332 options ED_SIC Link Here
327	device ipw # Intel 2100 wireless NICs.	329	device ipw # Intel 2100 wireless NICs.
328	device iwi # Intel 2200BG/2225BG/2915ABG wireless NICs.	330	device iwi # Intel 2200BG/2225BG/2915ABG wireless NICs.
329	device iwn # Intel 4965/1000/5000/6000 wireless NICs.	331	device iwn # Intel 4965/1000/5000/6000 wireless NICs.
		332	device ixl # Intel XL710 40Gbe PCIE Ethernet
		333	device ixlv # Intel XL710 40Gbe VF PCIE Ethernet
330	device mlx4ib # Mellanox ConnectX HCA InfiniBand	334	device mlx4ib # Mellanox ConnectX HCA InfiniBand
331	device mlxen # Mellanox ConnectX HCA Ethernet	335	device mlxen # Mellanox ConnectX HCA Ethernet
332	device mthca # Mellanox HCA InfiniBand	336	device mthca # Mellanox HCA InfiniBand