From 9eeb783ed4a11d7eb82d0cb5d23cc214e3827c8d Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Sun, 23 Aug 2009 15:32:06 +0200 Subject: 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 Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rt3070/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/staging/rt3070') diff --git a/drivers/staging/rt3070/Kconfig b/drivers/staging/rt3070/Kconfig index b37fb5d13a4..652d825338e 100644 --- a/drivers/staging/rt3070/Kconfig +++ b/drivers/staging/rt3070/Kconfig @@ -1,6 +1,6 @@ config RT3070 tristate "Ralink 3070 wireless support" - depends on USB && X86 && WLAN_80211 + depends on USB && X86 && WLAN_80211 && !RT2870 ---help--- This is an experimental driver for the Ralink 3070 wireless chip. -- cgit v1.2.3