From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
To: "Greg Kroah-Hartman" <gregkh@suse.de>
Cc: devel@driverdev.osuosl.org,
Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>,
Marcin Slusarz <marcin.slusarz@gmail.com>,
Mike Galbraith <efault@gmx.de>,
linux-kernel@vger.kernel.org
Subject: [PATCH 10/33] Staging: rt3070: add remaining rt2870 device ids
Date: Sun, 23 Aug 2009 15:29:51 +0200 [thread overview]
Message-ID: <20090823132951.17784.12331.sendpatchset@localhost.localdomain> (raw)
In-Reply-To: <20090823132846.17784.13359.sendpatchset@localhost.localdomain>
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Subject: [PATCH] Staging: rt3070: add remaining rt2870 device ids
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
---
drivers/staging/rt2870/2870_main_dev.c | 14 ++------------
1 file changed, 2 insertions(+), 12 deletions(-)
Index: b/drivers/staging/rt2870/2870_main_dev.c
===================================================================
--- a/drivers/staging/rt2870/2870_main_dev.c
+++ b/drivers/staging/rt2870/2870_main_dev.c
@@ -61,10 +61,8 @@ extern INT __devinit rt28xx_probe(IN voi
struct usb_device_id rtusb_usb_id[] = {
{ USB_DEVICE(0x148F, 0x2770) }, /* Ralink */
-#ifndef RT30xx
{ USB_DEVICE(0x1737, 0x0071) }, /* Linksys WUSB600N */
{ USB_DEVICE(0x1737, 0x0070) }, /* Linksys */
-#endif
{ USB_DEVICE(0x148F, 0x2870) }, /* Ralink */
{ USB_DEVICE(0x148F, 0x3070) }, /* Ralink 3070 */
#ifdef RT30xx
@@ -82,15 +80,11 @@ struct usb_device_id rtusb_usb_id[] = {
#endif
{ USB_DEVICE(0x0DF6, 0x002D) }, /* Sitecom */
{ USB_DEVICE(0x0DF6, 0x0039) }, /* Sitecom 2770 */
-#ifndef RT30xx
{ USB_DEVICE(0x0DF6, 0x003F) }, /* Sitecom WL-608 */
-#endif
{ USB_DEVICE(0x14B2, 0x3C06) }, /* Conceptronic */
{ USB_DEVICE(0x14B2, 0x3C28) }, /* Conceptronic */
{ USB_DEVICE(0x2019, 0xED06) }, /* Planex Communications, Inc. */
-#ifndef RT30xx
{ USB_DEVICE(0x2019, 0xED14) }, /* Planex Communications, Inc. */
-#endif
{ USB_DEVICE(0x2019, 0xAB25) }, /* Planex Communications, Inc. RT3070 */
{ USB_DEVICE(0x07D1, 0x3C09) }, /* D-Link */
{ USB_DEVICE(0x07D1, 0x3C11) }, /* D-Link */
@@ -101,10 +95,8 @@ struct usb_device_id rtusb_usb_id[] = {
{ USB_DEVICE(0x14B2, 0x3C07) }, /* AL */
{ USB_DEVICE(0x14B2, 0x3C12) }, /* AL 3070 */
{ USB_DEVICE(0x050D, 0x8053) }, /* Belkin */
-#ifndef RT30xx
{ USB_DEVICE(0x050D, 0x815C) }, /* Belkin */
{ USB_DEVICE(0x050D, 0x825a) }, /* Belkin */
-#endif
{ USB_DEVICE(0x14B2, 0x3C23) }, /* Airlink */
{ USB_DEVICE(0x14B2, 0x3C27) }, /* Airlink */
{ USB_DEVICE(0x07AA, 0x002F) }, /* Corega */
@@ -152,10 +144,9 @@ struct usb_device_id rtusb_usb_id[] = {
{ USB_DEVICE(0x04E8, 0x2018) }, /* samsung */
{ USB_DEVICE(0x07B8, 0x3070) }, /* AboCom 3070 */
{ USB_DEVICE(0x07B8, 0x3071) }, /* AboCom 3071 */
-#ifndef RT30xx
{ USB_DEVICE(0x07B8, 0x2870) }, /* AboCom */
{ USB_DEVICE(0x07B8, 0x2770) }, /* AboCom */
-#else
+#ifdef RT30xx
{ USB_DEVICE(0x07B8, 0x3072) }, /* Abocom 3072 */
#endif
{ USB_DEVICE(0x7392, 0x7711) }, /* Edimax 3070 */
@@ -167,9 +158,8 @@ struct usb_device_id rtusb_usb_id[] = {
{ USB_DEVICE(0x0789, 0x0162) }, /* Logitec 2870 */
{ USB_DEVICE(0x0789, 0x0163) }, /* Logitec 2870 */
{ USB_DEVICE(0x0789, 0x0164) }, /* Logitec 2870 */
-#ifndef RT30xx
{ USB_DEVICE(0x7392, 0x7717) }, /* Edimax */
-#else
+#ifdef RT30xx
{ USB_DEVICE(0x1EDA, 0x2310) }, /* AirTies 3070 */
{ USB_DEVICE(0x1737, 0x0077) }, /* Linksys WUSB54GC-EU v3 */
#endif
next prev parent reply other threads:[~2009-08-23 13:29 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-08-23 13:28 [PATCH 00/33] Staging: rt{286,287,307}0: merge rt3070 with rt2870 Bartlomiej Zolnierkiewicz
2009-08-23 13:28 ` [PATCH 01/33] Staging: rtxxxx: unify AsicRxAntEvalTimeout() Bartlomiej Zolnierkiewicz
2009-08-23 13:28 ` [PATCH 02/33] Staging: rtxxxx: unify AsicSwitchChannel() Bartlomiej Zolnierkiewicz
2009-08-23 13:29 ` [PATCH 03/33] Staging: rtxx70: unify NICInitRT30xxRFRegisters() Bartlomiej Zolnierkiewicz
2009-08-23 13:29 ` [PATCH 04/33] Staging: rtxxxx: RTMPGetRalinkAuthModeStr() fixes Bartlomiej Zolnierkiewicz
2009-08-23 13:29 ` [PATCH 05/33] Staging: rt3070: update allowed channels list for Japan Bartlomiej Zolnierkiewicz
2009-08-23 13:29 ` [PATCH 06/33] Staging: rt3070: fix PID checking in RTUSBEnqueueCmdFromNdis() Bartlomiej Zolnierkiewicz
2009-08-23 13:29 ` [PATCH 07/33] Staging: rt3070: WEP fixes Bartlomiej Zolnierkiewicz
2009-08-23 13:29 ` [PATCH 08/33] Staging: rt3070: AsicSetSlotTime() fix Bartlomiej Zolnierkiewicz
2009-08-23 13:29 ` [PATCH 09/33] Staging: rt3070: remove needless EFUSE_TAG register read Bartlomiej Zolnierkiewicz
2009-08-23 13:29 ` Bartlomiej Zolnierkiewicz [this message]
2009-08-23 13:29 ` [PATCH 11/33] Staging: rt2870: use internal command for AsicUpdateProtect() Bartlomiej Zolnierkiewicz
2009-08-23 13:30 ` [PATCH 12/33] Staging: rt2870: add fRTUSB_BULK_OUT_DATA_NORMAL_5 quirk Bartlomiej Zolnierkiewicz
2009-08-23 13:30 ` [PATCH 13/33] Staging: rt28x0: add SIOCGIWNAME support to rt_ioctl_giwscan() Bartlomiej Zolnierkiewicz
2009-08-23 13:30 ` [PATCH 14/33] Staging: rt28x0: fix GTK length check in ParseKeyData() Bartlomiej Zolnierkiewicz
2009-08-23 13:30 ` [PATCH 15/33] Staging: rt28x0: fix BPP_R66 register handling Bartlomiej Zolnierkiewicz
2009-08-23 13:30 ` [PATCH 16/33] Staging: rt28x0: fix fOP_STATUS_DOZE flag handling Bartlomiej Zolnierkiewicz
2009-08-23 13:30 ` [PATCH 17/33] Staging: rt28x0 fix BACapability policy handling Bartlomiej Zolnierkiewicz
2009-08-23 13:30 ` [PATCH 18/33] Staging: rt28x0: AsicSwitchChannel() fix Bartlomiej Zolnierkiewicz
2009-08-23 13:30 ` [PATCH 19/33] Staging: rt28x0: BssTableSetEntry() fix Bartlomiej Zolnierkiewicz
2009-08-23 13:30 ` [PATCH 20/33] Staging: rt28x0: MlmeSelectTxRateTable() fix Bartlomiej Zolnierkiewicz
2009-08-23 13:31 ` [PATCH 21/33] Staging: rt28x0: MlmeCheckPsmChange() fix Bartlomiej Zolnierkiewicz
2009-08-23 13:31 ` [PATCH 22/33] Staging: rt28x0: MlmeAssocReqAction() fixes for wpa_supplicant support Bartlomiej Zolnierkiewicz
2009-08-23 13:31 ` [PATCH 23/33] Staging: rt28x0: rt_ioctl_siwencode() fixes Bartlomiej Zolnierkiewicz
2009-08-23 13:31 ` [PATCH 24/33] Staging: rt28x0: LinkUp() fixes Bartlomiej Zolnierkiewicz
2009-08-23 13:31 ` [PATCH 25/33] Staging: rt3070: remove unused MiniportDataMMRequest() Bartlomiej Zolnierkiewicz
2009-08-23 13:31 ` [PATCH 26/33] Staging: rt3070: remove unused RT_CMD_SET_* internal commands Bartlomiej Zolnierkiewicz
2009-08-23 13:31 ` [PATCH 27/33] Staging: rt2870: remove SHOW_ADHOC_ENTRY_INFO support Bartlomiej Zolnierkiewicz
2009-08-23 13:31 ` [PATCH 28/33] Staging: rtxxxx: remove unused AsicAntenna{Select,Setting}() Bartlomiej Zolnierkiewicz
2009-08-23 13:31 ` [PATCH 29/33] Staging: rt2870: add eFuse support Bartlomiej Zolnierkiewicz
2009-08-23 13:32 ` [PATCH 30/33] Staging: rt2870: add Antenna Diversity support Bartlomiej Zolnierkiewicz
2009-08-23 13:32 ` [PATCH 31/33] Staging: rtxx70: merge rt3070 with rt2870 Bartlomiej Zolnierkiewicz
2009-08-23 13:32 ` [PATCH 32/33] Staging: rt2870: remove old firmware Bartlomiej Zolnierkiewicz
2009-08-23 13:32 ` [PATCH 33/33] Staging: remove no longer needed rt3070 driver Bartlomiej Zolnierkiewicz
2009-08-23 16:49 ` [PATCH 00/33] Staging: rt{286,287,307}0: merge rt3070 with rt2870 Greg KH
2009-08-23 17:33 ` Marcin Slusarz
2009-08-30 12:28 ` Bartlomiej Zolnierkiewicz
2009-08-24 5:54 ` Mike Galbraith
2009-08-30 12:28 ` Bartlomiej Zolnierkiewicz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090823132951.17784.12331.sendpatchset@localhost.localdomain \
--to=bzolnier@gmail.com \
--cc=devel@driverdev.osuosl.org \
--cc=efault@gmx.de \
--cc=gregkh@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=marcin.slusarz@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox