diff options
| author | attilio <attilio@FreeBSD.org> | 2011-05-02 14:23:36 +0000 |
|---|---|---|
| committer | attilio <attilio@FreeBSD.org> | 2011-05-02 14:23:36 +0000 |
| commit | fd4965df40517e8f3eac90b6e4aa7e03bb3b5370 (patch) | |
| tree | 42e744cbff7dd7f803cf0d0e1fb69e96befa541c /sys/amd64 | |
| parent | 8844d3fb82ff374bdbe0da16411eecfd786bbc77 (diff) | |
| download | FreeBSD-src-fd4965df40517e8f3eac90b6e4aa7e03bb3b5370.zip FreeBSD-src-fd4965df40517e8f3eac90b6e4aa7e03bb3b5370.tar.gz | |
MFC @ r221324
Diffstat (limited to 'sys/amd64')
| -rw-r--r-- | sys/amd64/conf/GENERIC | 10 | ||||
| -rw-r--r-- | sys/amd64/pci/pci_bus.c | 1 |
2 files changed, 11 insertions, 0 deletions
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index e20bc6f..33c142c 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -261,8 +261,16 @@ device ath_pci # Atheros pci/cardbus glue device ath_hal # pci/cardbus chip support options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors device ath_rate_sample # SampleRate tx rate control for ath +#device bwi # Broadcom BCM430x/BCM431x wireless NICs. +#device bwn # Broadcom BCM43xx wireless NICs. +device ipw # Intel 2100 wireless NICs. +device iwi # Intel 2200BG/2225BG/2915ABG wireless NICs. +device iwn # Intel 4965/1000/5000/6000 wireless NICs. +device malo # Marvell Libertas wireless NICs. +device mwl # Marvell 88W8363 802.11n wireless NICs. device ral # Ralink Technology RT2500 wireless NICs. device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs. +device wpi # Intel 3945ABG wireless NICs. # Pseudo devices. device loop # Network loopback @@ -314,7 +322,9 @@ device rue # RealTek RTL8150 USB Ethernet device udav # Davicom DM9601E USB # USB Wireless device rum # Ralink Technology RT2501USB wireless NICs +device run # Ralink Technology RT2700/RT2800/RT3000 NICs. device uath # Atheros AR5523 wireless NICs +device upgt # Conexant/Intersil PrismGT wireless NICs. device ural # Ralink Technology RT2500USB wireless NICs device urtw # Realtek RTL8187B/L wireless NICs device zyd # ZyDAS zb1211/zb1211b wireless NICs diff --git a/sys/amd64/pci/pci_bus.c b/sys/amd64/pci/pci_bus.c index e943df1..0f33cdf 100644 --- a/sys/amd64/pci/pci_bus.c +++ b/sys/amd64/pci/pci_bus.c @@ -348,6 +348,7 @@ static device_method_t legacy_pcib_methods[] = { DEVMETHOD(bus_read_ivar, legacy_pcib_read_ivar), DEVMETHOD(bus_write_ivar, legacy_pcib_write_ivar), DEVMETHOD(bus_alloc_resource, legacy_pcib_alloc_resource), + DEVMETHOD(bus_adjust_resource, bus_generic_adjust_resource), DEVMETHOD(bus_release_resource, bus_generic_release_resource), DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), |
