Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[uclinux-h8/linux.git] / drivers / net / wireless / ath / ath9k / hif_usb.c

diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.c b/drivers/net/wireless/ath/ath9k/hif_usb.c
index 165dd20..8cbf490 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/hif_usb.c
+++ b/drivers/net/wireless/ath/ath9k/hif_usb.c
@@ -55,6 +55,8 @@ static struct usb_device_id ath9k_hif_usb_ids[] = {
          .driver_info = AR9280_USB },  /* Buffalo WLI-UV-AG300P */
        { USB_DEVICE(0x04da, 0x3904),
          .driver_info = AR9280_USB },
+       { USB_DEVICE(0x0930, 0x0a08),
+         .driver_info = AR9280_USB },  /* Toshiba WLM-20U2 and GN-1080 */
 
        { USB_DEVICE(0x0cf3, 0x20ff),
          .driver_info = STORAGE_DEVICE },