aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAxel K <rain_maker@root-forum.org>2009-09-03 14:53:36 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2009-09-15 15:02:33 -0400
commita85236c34116621b372c309aa25c2f9bae1b8a15 (patch)
tree46bc95396c5368d7e571dcd4e6e1023b0f5b2484 /drivers
parent87cbcb673481be97b96cbbeba4aac654937bc335 (diff)
Staging: rt2860: add new device ids
This patch adds new device IDs to ralink rt2860 driver in linux staging. The device IDs were retrieved from the latest vendor release (version 2.1.2.0). Signed-off-by: Axel Koellhofer <rain_maker@root-forum.org> Acked-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/staging/rt2860/2860_main_dev.c7
-rw-r--r--drivers/staging/rt2860/rt2860.h2
2 files changed, 9 insertions, 0 deletions
diff --git a/drivers/staging/rt2860/2860_main_dev.c b/drivers/staging/rt2860/2860_main_dev.c
index c7038e03a4dc..c2f02963f91c 100644
--- a/drivers/staging/rt2860/2860_main_dev.c
+++ b/drivers/staging/rt2860/2860_main_dev.c
@@ -99,6 +99,13 @@ static struct pci_device_id rt2860_pci_tbl[] __devinitdata =
99 {PCI_DEVICE(NIC_PCI_VENDOR_ID, NIC2760_PCI_DEVICE_ID)}, 99 {PCI_DEVICE(NIC_PCI_VENDOR_ID, NIC2760_PCI_DEVICE_ID)},
100 {PCI_DEVICE(NIC_PCI_VENDOR_ID, NIC2790_PCIe_DEVICE_ID)}, 100 {PCI_DEVICE(NIC_PCI_VENDOR_ID, NIC2790_PCIe_DEVICE_ID)},
101 {PCI_DEVICE(VEN_AWT_PCI_VENDOR_ID, VEN_AWT_PCIe_DEVICE_ID)}, 101 {PCI_DEVICE(VEN_AWT_PCI_VENDOR_ID, VEN_AWT_PCIe_DEVICE_ID)},
102 {PCI_DEVICE(EDIMAX_PCI_VENDOR_ID, 0x7708)},
103 {PCI_DEVICE(EDIMAX_PCI_VENDOR_ID, 0x7728)},
104 {PCI_DEVICE(EDIMAX_PCI_VENDOR_ID, 0x7758)},
105 {PCI_DEVICE(EDIMAX_PCI_VENDOR_ID, 0x7727)},
106 {PCI_DEVICE(EDIMAX_PCI_VENDOR_ID, 0x7738)},
107 {PCI_DEVICE(EDIMAX_PCI_VENDOR_ID, 0x7748)},
108 {PCI_DEVICE(EDIMAX_PCI_VENDOR_ID, 0x7768)},
102 {0,} // terminate list 109 {0,} // terminate list
103}; 110};
104 111
diff --git a/drivers/staging/rt2860/rt2860.h b/drivers/staging/rt2860/rt2860.h
index 4fbec906e106..ed28fe5757c9 100644
--- a/drivers/staging/rt2860/rt2860.h
+++ b/drivers/staging/rt2860/rt2860.h
@@ -292,6 +292,8 @@ rt2860_interrupt(int irq, void *dev_instance);
292#define VEN_AWT_PCIe_DEVICE_ID 0x1059 292#define VEN_AWT_PCIe_DEVICE_ID 0x1059
293#define VEN_AWT_PCI_VENDOR_ID 0x1A3B 293#define VEN_AWT_PCI_VENDOR_ID 0x1A3B
294 294
295#define EDIMAX_PCI_VENDOR_ID 0x1432
296
295// For RTMPPCIePowerLinkCtrlRestore () function 297// For RTMPPCIePowerLinkCtrlRestore () function
296#define RESTORE_HALT 1 298#define RESTORE_HALT 1
297#define RESTORE_WAKEUP 2 299#define RESTORE_WAKEUP 2