diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-10-27 18:21:36 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-10-27 18:30:18 +1100 |
| commit | 8b639e07efdb1b21ca60eeb3f8f5ac5038761200 (patch) | |
| tree | dd326f297c6c26c65477eea299667cf2d481fdd8 /drivers/staging/rt2860/Kconfig | |
| parent | 3a647a6ce4006ea8b84e4eaa6e18204cd911ed99 (diff) | |
| parent | 1f0f7a7df20bd69cb8553136613bda38dcddfcb1 (diff) | |
Merge branch 'quilt/staging'
Conflicts:
drivers/net/wireless/Kconfig
Diffstat (limited to 'drivers/staging/rt2860/Kconfig')
| -rw-r--r-- | drivers/staging/rt2860/Kconfig | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/staging/rt2860/Kconfig b/drivers/staging/rt2860/Kconfig index 7f44e5e72463..602e81830e70 100644 --- a/drivers/staging/rt2860/Kconfig +++ b/drivers/staging/rt2860/Kconfig @@ -1,5 +1,6 @@ config RT2860 - tristate "Ralink 2860 wireless support" + tristate "Ralink 2860/3090 wireless support" depends on PCI && X86 && WLAN_80211 ---help--- - This is an experimental driver for the Ralink 2860 wireless chip. + This is an experimental driver for the Ralink 2860 and 3090 + wireless chips. |