From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Sun, 23 Aug 2009 13:32:06 +0000 (+0200)
Subject: Staging: rtxx70: merge rt3070 with rt2870
X-Git-Tag: v2.6.32-rc1~668^2~105
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9eeb783ed4a11d7eb82d0cb5d23cc214e3827c8d;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed