diff options
| author | David S. Miller <davem@davemloft.net> | 2010-10-20 04:59:48 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-10-20 04:59:48 -0400 |
| commit | 5eeaa2db162f1f6d83e988d4d28f4ba7be600e44 (patch) | |
| tree | 440e245201485fcfb7858bf57aae755c00b15651 /drivers/net/wireless/Kconfig | |
| parent | c5e90f562047ff9713183cf5e18f5e8997bc7373 (diff) | |
| parent | c64557d666eb62eb5f296c6b93bd0a5525ed1e36 (diff) | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
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 174e3442d519..4de4410cd38e 100644 --- a/drivers/net/wireless/Kconfig +++ b/drivers/net/wireless/Kconfig | |||
| @@ -279,6 +279,7 @@ source "drivers/net/wireless/libertas/Kconfig" | |||
| 279 | source "drivers/net/wireless/orinoco/Kconfig" | 279 | source "drivers/net/wireless/orinoco/Kconfig" |
| 280 | source "drivers/net/wireless/p54/Kconfig" | 280 | source "drivers/net/wireless/p54/Kconfig" |
| 281 | source "drivers/net/wireless/rt2x00/Kconfig" | 281 | source "drivers/net/wireless/rt2x00/Kconfig" |
| 282 | source "drivers/net/wireless/wl1251/Kconfig" | ||
| 282 | source "drivers/net/wireless/wl12xx/Kconfig" | 283 | source "drivers/net/wireless/wl12xx/Kconfig" |
| 283 | source "drivers/net/wireless/zd1211rw/Kconfig" | 284 | source "drivers/net/wireless/zd1211rw/Kconfig" |
| 284 | 285 | ||