Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 56823
b: refs/heads/master
c: 64902cb
h: refs/heads/master
i:
  56821: 51d1ed4
  56819: be80c20
  56815: ba65e20
v: v3
  • Loading branch information
Matthew Davidson authored and Greg Kroah-Hartman committed May 23, 2007
1 parent ffa6cca commit 72813ab
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: deb3d7fff0b7c21c5a80b2fdfb93d7fb1abcf21f
refs/heads/master: 64902cbaf17a5c81a2ed0cca51bf57227086df65
10 changes: 8 additions & 2 deletions trunk/drivers/usb/storage/unusual_devs.h
Original file line number Diff line number Diff line change
Expand Up @@ -1179,14 +1179,20 @@ UNUSUAL_DEV( 0x0a17, 0x006, 0x0000, 0xffff,
US_SC_DEVICE, US_PR_DEVICE, NULL,
US_FL_FIX_INQUIRY ),

/* This is a virtual windows driver CD, which the zd1211rw driver automatically
* converts into a WLAN device. */
/* These are virtual windows driver CDs, which the zd1211rw driver automatically
* converts into a WLAN devices. */
UNUSUAL_DEV( 0x0ace, 0x2011, 0x0101, 0x0101,
"ZyXEL",
"G-220F USB-WLAN Install",
US_SC_DEVICE, US_PR_DEVICE, NULL,
US_FL_IGNORE_DEVICE ),

UNUSUAL_DEV( 0x0ace, 0x20ff, 0x0101, 0x0101,
"SiteCom",
"WL-117 USB-WLAN Install",
US_SC_DEVICE, US_PR_DEVICE, NULL,
US_FL_IGNORE_DEVICE ),

#ifdef CONFIG_USB_STORAGE_ISD200
UNUSUAL_DEV( 0x0bf6, 0xa001, 0x0100, 0x0110,
"ATI",
Expand Down

0 comments on commit 72813ab

Please sign in to comment.