diff options
| author | Bartlomiej Zolnierkiewicz | 2009-08-23 15:32:06 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2009-09-15 21:02:23 +0200 |
| commit | 9eeb783ed4a11d7eb82d0cb5d23cc214e3827c8d (patch) | |
| tree | 77f8c138a7f0f825e95b88921a59ae96068b6226 /drivers/staging/rt2870/Kconfig | |
| parent | Staging: rt2870: add Antenna Diversity support (diff) | |
| download | kernel-qcow2-linux-9eeb783ed4a11d7eb82d0cb5d23cc214e3827c8d.tar.gz kernel-qcow2-linux-9eeb783ed4a11d7eb82d0cb5d23cc214e3827c8d.tar.xz kernel-qcow2-linux-9eeb783ed4a11d7eb82d0cb5d23cc214e3827c8d.zip | |
Staging: rtxx70: merge rt3070 with rt2870
* remove RT30xx ifdefs
* add -DRT3070 to rt2870's EXTRA_CFLAGS
* because of changes in the way that hardware is initialized/accessed
rt3070 driver's firmware should be now also used by rt2870 driver
(this is also done by newer out-of-tree vendor driver versions, i.e.
2.1.0.0, historically in-kernel driver was based on 1.4.0.0 version)
* change RT28xx_CHIP_NAME to RTxx70
* update rt2870's help entry text
* add MODULE_ALIAS("rt3070sta") to rt2870
* update rt3070's dependencies
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rt2870/Kconfig')
| -rw-r--r-- | drivers/staging/rt2870/Kconfig | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/staging/rt2870/Kconfig b/drivers/staging/rt2870/Kconfig index 8398d9797e1d..76841f6dea93 100644 --- a/drivers/staging/rt2870/Kconfig +++ b/drivers/staging/rt2870/Kconfig @@ -1,6 +1,5 @@ config RT2870 - tristate "Ralink 2870 wireless support" + tristate "Ralink 2870/3070 wireless support" depends on USB && X86 && WLAN_80211 ---help--- - This is an experimental driver for the Ralink 2870 wireless chip. - + This is an experimental driver for the Ralink xx70 wireless chips. |