diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-06 08:57:15 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-06 08:57:15 -0400 |
| commit | 71ec63c5d66b577a71910b82740751be73e81310 (patch) | |
| tree | 8a3b7b4fd4068fae1b2fd7ab15e29645daa524f8 /drivers/net/wireless/Kconfig | |
| parent | 627add2d1385394d020c84533c91ad26bc37b166 (diff) | |
| parent | 120bda20c6f64b32e8bfbdd7b34feafaa5f5332e (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/net/wireless/Kconfig')
| -rw-r--r-- | drivers/net/wireless/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig index 30ec235e6935..fa9d2c4edc93 100644 --- a/drivers/net/wireless/Kconfig +++ b/drivers/net/wireless/Kconfig | |||
| @@ -550,6 +550,7 @@ config USB_ZD1201 | |||
| 550 | 550 | ||
| 551 | source "drivers/net/wireless/hostap/Kconfig" | 551 | source "drivers/net/wireless/hostap/Kconfig" |
| 552 | source "drivers/net/wireless/bcm43xx/Kconfig" | 552 | source "drivers/net/wireless/bcm43xx/Kconfig" |
| 553 | source "drivers/net/wireless/zd1211rw/Kconfig" | ||
| 553 | 554 | ||
| 554 | # yes, this works even when no drivers are selected | 555 | # yes, this works even when no drivers are selected |
| 555 | config NET_WIRELESS | 556 | config NET_WIRELESS |