diff options
author | benjsc <benjsc@FreeBSD.org> | 2007-11-08 22:09:37 +0000 |
---|---|---|
committer | benjsc <benjsc@FreeBSD.org> | 2007-11-08 22:09:37 +0000 |
commit | f9553858df254346c6309df6e055deb5d4c1901e (patch) | |
tree | eba2dd07c9d1112ecfff79ebe2b601537bd7b53b | |
parent | 61e0f250127347856ea8c1d3e5883f56e3a51f2c (diff) | |
download | FreeBSD-src-f9553858df254346c6309df6e055deb5d4c1901e.zip FreeBSD-src-f9553858df254346c6309df6e055deb5d4c1901e.tar.gz |
Link wpi(4) into the build.
This includes:
o mtree (for legal/intel_wpi)
o manpage for i386/amd64 archs
o module for i386/amd64 archs
o NOTES for i386/amd64 archs
Approved by: mlaier (comentor)
-rw-r--r-- | etc/mtree/BSD.usr.dist | 2 | ||||
-rw-r--r-- | share/doc/legal/Makefile | 3 | ||||
-rw-r--r-- | share/man/man4/Makefile | 4 | ||||
-rw-r--r-- | sys/amd64/conf/NOTES | 2 | ||||
-rw-r--r-- | sys/conf/files.amd64 | 1 | ||||
-rw-r--r-- | sys/conf/files.i386 | 1 | ||||
-rw-r--r-- | sys/i386/conf/NOTES | 2 | ||||
-rw-r--r-- | sys/modules/Makefile | 6 |
8 files changed, 20 insertions, 1 deletions
diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist index 9ebc033d..ca5b418 100644 --- a/etc/mtree/BSD.usr.dist +++ b/etc/mtree/BSD.usr.dist @@ -80,6 +80,8 @@ .. intel_iwi .. + intel_wpi + .. .. ncurses .. diff --git a/share/doc/legal/Makefile b/share/doc/legal/Makefile index 958980f..bc079ec 100644 --- a/share/doc/legal/Makefile +++ b/share/doc/legal/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ SUBDIR= intel_ipw \ - intel_iwi + intel_iwi \ + intel_wpi .include <bsd.subdir.mk> diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index b8a69c4..8e95aa3 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -412,6 +412,7 @@ MAN= aac.4 \ wlan_tkip.4 \ wlan_wep.4 \ wlan_xauth.4 \ + ${_wpi.4} \ xe.4 \ xl.4 \ xpt.4 \ @@ -534,6 +535,7 @@ MLINKS+=vr.4 if_vr.4 MLINKS+=watchdog.4 SW_WATCHDOG.4 MLINKS+=wb.4 if_wb.4 MLINKS+=wi.4 if_wi.4 +MLINKS+=${_wpi.4} ${_if_wpi.4} MLINKS+=xe.4 if_xe.4 MLINKS+=xl.4 if_xl.4 @@ -547,6 +549,7 @@ _ichwd.4= ichwd.4 _if_nfe.4= if_nfe.4 _if_nve.4= if_nve.4 _if_nxge.4= if_nxge.4 +_if_wpi.4= if_wpi.4 _ipmi.4= ipmi.4 _nfe.4= nfe.4 _nfsmb.4= nfsmb.4 @@ -555,6 +558,7 @@ _nxge.4= nxge.4 _rr232x.4= rr232x.4 _speaker.4= speaker.4 _spkr.4= spkr.4 +_wpi.4= wpi.4 .endif .if exists(${.CURDIR}/man4.${MACHINE_ARCH}) diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES index 207fa07..68f88b6 100644 --- a/sys/amd64/conf/NOTES +++ b/sys/amd64/conf/NOTES @@ -315,6 +315,7 @@ options DRM_DEBUG # Include debug printfs (slow) # nve: nVidia nForce MCP on-board Ethernet Networking # ral: Ralink Technology IEEE 802.11 wireless adapter # ural: Ralink Technology RT2500USB IEEE 802.11 wireless adapter +# wpi: Intel 3945ABG Wireless LAN controller device ed options ED_3C503 @@ -326,6 +327,7 @@ device nfe # nVidia nForce MCP on-board Ethernet Networking device nve # nVidia nForce MCP on-board Ethernet Networking device ral device ural +device wpi device ath device ath_hal # Atheros HAL (includes binary component) diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64 index 505dec6..fc5db37 100644 --- a/sys/conf/files.amd64 +++ b/sys/conf/files.amd64 @@ -201,6 +201,7 @@ dev/syscons/scterm-sc.c optional sc dev/syscons/scvgarndr.c optional sc vga dev/syscons/scvtb.c optional sc dev/uart/uart_cpu_amd64.c optional uart +dev/wpi/if_wpi.c optional wpi isa/syscons_isa.c optional sc isa/vga_isa.c optional vga kern/link_elf_obj.c standard diff --git a/sys/conf/files.i386 b/sys/conf/files.i386 index db1768b..2c03317 100644 --- a/sys/conf/files.i386 +++ b/sys/conf/files.i386 @@ -235,6 +235,7 @@ dev/syscons/scvgarndr.c optional sc vga dev/syscons/scvtb.c optional sc dev/uart/uart_cpu_i386.c optional uart dev/acpica/acpi_if.m standard +dev/wpi/if_wpi.c optional wpi i386/acpica/OsdEnvironment.c optional acpi i386/acpica/acpi_machdep.c optional acpi i386/acpica/acpi_wakeup.c optional acpi diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index f73add9..eac6c55 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -604,6 +604,7 @@ hint.mse.0.irq="5" # sr: RISCom/N2 hdlc sync 1/2 port V.35/X.21 serial driver (requires sppp) # ural: Ralink Technology RT2500USB IEEE 802.11 wireless adapter # wl: Lucent Wavelan (ISA card only). +# wpi: Intel 3945ABG Wireless LAN controller # Order for ISA/EISA devices is important here @@ -673,6 +674,7 @@ hint.wl.0.at="isa" hint.wl.0.port="0x300" options WLCACHE # enables the signal-strength cache options WLDEBUG # enables verbose debugging output +device wpi device ath device ath_hal # Atheros HAL (includes binary component) diff --git a/sys/modules/Makefile b/sys/modules/Makefile index a76e61f..0d1ec19 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -309,6 +309,8 @@ SUBDIR= ${_3dfx} \ wlan_tkip \ wlan_wep \ wlan_xauth \ + ${_wpi} \ + ${_wpifw} \ ${_xe} \ xfs \ xl \ @@ -464,6 +466,8 @@ _nfe= nfe _nve= nve _nvram= nvram _nxge= nxge +_wpi= wpi +_wpifw= wpifw .if ${MK_CRYPT} != "no" || defined(ALL_MODULES) .if exists(${.CURDIR}/../crypto/via) _padlock= padlock @@ -537,6 +541,8 @@ _sppp= sppp _tmpfs= tmpfs _twa= twa _wi= wi +_wpi= wpi +_wpifw= wpifw .if ${MK_ZFS} != "no" || defined(ALL_MODULES) _zfs= zfs .endif |