From d0e24a2d838828cfc95af3f6d7a81ee69b936c24 Mon Sep 17 00:00:00 2001 From: Axel K Date: Thu, 3 Sep 2009 20:53:36 +0200 Subject: [PATCH] --- yaml --- r: 162558 b: refs/heads/master c: a85236c34116621b372c309aa25c2f9bae1b8a15 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/rt2860/2860_main_dev.c | 7 +++++++ trunk/drivers/staging/rt2860/rt2860.h | 2 ++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 733d6775c583..37e18851a7a4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 87cbcb673481be97b96cbbeba4aac654937bc335 +refs/heads/master: a85236c34116621b372c309aa25c2f9bae1b8a15 diff --git a/trunk/drivers/staging/rt2860/2860_main_dev.c b/trunk/drivers/staging/rt2860/2860_main_dev.c index c7038e03a4dc..c2f02963f91c 100644 --- a/trunk/drivers/staging/rt2860/2860_main_dev.c +++ b/trunk/drivers/staging/rt2860/2860_main_dev.c @@ -99,6 +99,13 @@ static struct pci_device_id rt2860_pci_tbl[] __devinitdata = {PCI_DEVICE(NIC_PCI_VENDOR_ID, NIC2760_PCI_DEVICE_ID)}, {PCI_DEVICE(NIC_PCI_VENDOR_ID, NIC2790_PCIe_DEVICE_ID)}, {PCI_DEVICE(VEN_AWT_PCI_VENDOR_ID, VEN_AWT_PCIe_DEVICE_ID)}, + {PCI_DEVICE(EDIMAX_PCI_VENDOR_ID, 0x7708)}, + {PCI_DEVICE(EDIMAX_PCI_VENDOR_ID, 0x7728)}, + {PCI_DEVICE(EDIMAX_PCI_VENDOR_ID, 0x7758)}, + {PCI_DEVICE(EDIMAX_PCI_VENDOR_ID, 0x7727)}, + {PCI_DEVICE(EDIMAX_PCI_VENDOR_ID, 0x7738)}, + {PCI_DEVICE(EDIMAX_PCI_VENDOR_ID, 0x7748)}, + {PCI_DEVICE(EDIMAX_PCI_VENDOR_ID, 0x7768)}, {0,} // terminate list }; diff --git a/trunk/drivers/staging/rt2860/rt2860.h b/trunk/drivers/staging/rt2860/rt2860.h index 4fbec906e106..ed28fe5757c9 100644 --- a/trunk/drivers/staging/rt2860/rt2860.h +++ b/trunk/drivers/staging/rt2860/rt2860.h @@ -292,6 +292,8 @@ rt2860_interrupt(int irq, void *dev_instance); #define VEN_AWT_PCIe_DEVICE_ID 0x1059 #define VEN_AWT_PCI_VENDOR_ID 0x1A3B +#define EDIMAX_PCI_VENDOR_ID 0x1432 + // For RTMPPCIePowerLinkCtrlRestore () function #define RESTORE_HALT 1 #define RESTORE_WAKEUP 2