diff options
| author | David S. Miller <davem@davemloft.net> | 2009-06-03 05:43:41 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-06-03 05:43:41 -0400 |
| commit | b2f8f7525c8aa1fdd8ad8c72c832dfb571d5f768 (patch) | |
| tree | 71ae1801d264bca62efa0d22376b49de7f206e9a /drivers/net/wireless/Kconfig | |
| parent | d455e5b165a367a628110ec2d18807ea10052cd1 (diff) | |
| parent | 12186be7d2e1106cede1cc728526e3d7998cbe94 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/forcedeth.c
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 a67d29290ba0..867324163ca2 100644 --- a/drivers/net/wireless/Kconfig +++ b/drivers/net/wireless/Kconfig | |||
| @@ -431,6 +431,7 @@ config RTL8187 | |||
| 431 | ASUS P5B Deluxe | 431 | ASUS P5B Deluxe |
| 432 | Toshiba Satellite Pro series of laptops | 432 | Toshiba Satellite Pro series of laptops |
| 433 | Asus Wireless Link | 433 | Asus Wireless Link |
| 434 | Linksys WUSB54GC-EU | ||
| 434 | 435 | ||
| 435 | Thanks to Realtek for their support! | 436 | Thanks to Realtek for their support! |
| 436 | 437 | ||