Staging: rtxx70: merge rt3070 with rt2870
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Sun, 23 Aug 2009 13:32:06 +0000 (15:32 +0200)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 15 Sep 2009 19:02:23 +0000 (12:02 -0700)
commit9eeb783ed4a11d7eb82d0cb5d23cc214e3827c8d
tree77f8c138a7f0f825e95b88921a59ae96068b6226
parent606661ea0476fb506ca87cd41b58cbb7dc14fcc0
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>
12 files changed:
drivers/staging/rt2860/common/cmm_info.c
drivers/staging/rt2860/common/mlme.c
drivers/staging/rt2860/common/rtmp_init.c
drivers/staging/rt2860/rt_main_dev.c
drivers/staging/rt2860/rtmp.h
drivers/staging/rt2870/2870_main_dev.c
drivers/staging/rt2870/Kconfig
drivers/staging/rt2870/Makefile
drivers/staging/rt2870/common/cmm_data_2870.c
drivers/staging/rt2870/common/rtusb_io.c
drivers/staging/rt2870/rt2870.h
drivers/staging/rt3070/Kconfig