diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-08-23 15:32:06 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-15 12:02:23 -0700 |
| commit | 9eeb783ed4a11d7eb82d0cb5d23cc214e3827c8d (patch) | |
| tree | 77f8c138a7f0f825e95b88921a59ae96068b6226 /drivers/staging/rt2870/rt2870.h | |
| parent | 606661ea0476fb506ca87cd41b58cbb7dc14fcc0 (diff) | |
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/rt2870.h')
| -rw-r--r-- | drivers/staging/rt2870/rt2870.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/staging/rt2870/rt2870.h b/drivers/staging/rt2870/rt2870.h index 131f3329ac9c..4c67bafad4e6 100644 --- a/drivers/staging/rt2870/rt2870.h +++ b/drivers/staging/rt2870/rt2870.h @@ -349,11 +349,8 @@ extern UCHAR EpToQueue[6]; { RTUSB_SET_BULK_FLAG(pAd, fRTUSB_BULK_OUT_PSPOLL); \ RTUSBKickBulkOut(pAd); } -#ifdef RT30xx -#define RT28xx_CHIP_NAME "RT3070" -#else -#define RT28xx_CHIP_NAME "RT2870" -#endif +#define RT28xx_CHIP_NAME "RTxx70" + #define USB_CYC_CFG 0x02a4 #define STATUS_SUCCESS 0x00 #define STATUS_UNSUCCESSFUL 0x01 @@ -462,9 +459,7 @@ typedef struct _RT_SET_ASIC_WCID { ULONG WCID; // mechanism for rekeying: 0:disable, 1: time-based, 2: packet-based ULONG SetTid; // time-based: seconds, packet-based: kilo-packets ULONG DeleteTid; // time-based: seconds, packet-based: kilo-packets -#ifndef RT30xx UCHAR Addr[MAC_ADDR_LEN]; // avoid in interrupt when write key -#endif } RT_SET_ASIC_WCID,*PRT_SET_ASIC_WCID; typedef struct _RT_SET_ASIC_WCID_ATTRI { |