Merge branch 'topic/asoc' into for-linus

[pandora-kernel.git] / drivers / staging / rt2870 / rt2870.h

diff --git a/drivers/staging/rt2870/rt2870.h b/drivers/staging/rt2870/rt2870.h
index 5dd15aa..a69cf33 100644 (file)
--- a/drivers/staging/rt2870/rt2870.h
+++ b/drivers/staging/rt2870/rt2870.h
@@ -96,6 +96,7 @@
        {USB_DEVICE(0x0DF6,0x002B)}, /* Sitecom */              \
        {USB_DEVICE(0x0DF6,0x002C)}, /* Sitecom */              \
        {USB_DEVICE(0x0DF6,0x002D)}, /* Sitecom */              \
+       {USB_DEVICE(0x0DF6,0x0039)}, /* Sitecom */              \
        {USB_DEVICE(0x14B2,0x3C06)}, /* Conceptronic */         \
        {USB_DEVICE(0x14B2,0x3C28)}, /* Conceptronic */         \
        {USB_DEVICE(0x2019,0xED06)}, /* Planex Communications, Inc. */          \
@@ -144,6 +145,7 @@
        {USB_DEVICE(0x0789,0x0162)}, /* Logitec */              \
        {USB_DEVICE(0x0789,0x0163)}, /* Logitec */              \
        {USB_DEVICE(0x0789,0x0164)}, /* Logitec */              \
+       {USB_DEVICE(0x7392,0x7717)}, /* Edimax */               \
        { }/* Terminating entry */                      \
 }