Skip to content

Commit

Permalink
Merge /spare/repo/netdev-2.6 branch 'ieee80211'
Browse files Browse the repository at this point in the history
  • Loading branch information
Jeff Garzik committed Jun 28, 2005
2 parents aa8f6df + ad3fee5 commit 30b4d65
Show file tree
Hide file tree
Showing 7 changed files with 155 additions and 237 deletions.
3 changes: 1 addition & 2 deletions drivers/net/wireless/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -192,9 +192,8 @@ config IPW_DEBUG

config IPW2200
tristate "Intel PRO/Wireless 2200BG and 2915ABG Network Connection"
depends on NET_RADIO && PCI
depends on IEEE80211 && PCI
select FW_LOADER
select IEEE80211
---help---
A driver for the Intel PRO/Wireless 2200BG and 2915ABG Network
Connection adapters.
Expand Down
Loading

0 comments on commit 30b4d65

Please sign in to comment.