diff options
| author | Benjamin Close <benjsc@FreeBSD.org> | 2007-11-08 22:09:37 +0000 |
|---|---|---|
| committer | Benjamin Close <benjsc@FreeBSD.org> | 2007-11-08 22:09:37 +0000 |
| commit | 037347714a1f0adb266cd3d05eaf68bc15f2274a (patch) | |
| tree | eba2dd07c9d1112ecfff79ebe2b601537bd7b53b /sys | |
| parent | 8ffeaa536ba12d93ab0bdcc3a70dc45498bfbfa7 (diff) | |
Notes
Diffstat (limited to 'sys')
| -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 |
5 files changed, 12 insertions, 0 deletions
diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES index 207fa07e037e..68f88b61ca1e 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 505dec6272bd..fc5db37621c9 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 db1768b717e7..2c0331706edd 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 f73add963c58..eac6c556a237 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 a76e61f78dae..0d1ec1947bb1 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 |