diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-21 12:25:47 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-21 12:25:47 -0500 |
commit | 2bf2154c6bb5599e3ec3f73c34861a0b12aa839e (patch) | |
tree | 62691bd915e2e3c2e6648306d3fb893f7a1dc57e /drivers/usb/net/pegasus.h | |
parent | 08a4ecee986dd98e86090ff5faac4782b6765aed (diff) | |
parent | 71a8924bee63d891f6256d560e32416a458440b3 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6: (81 commits)
[PATCH] USB: omninet: fix up debugging comments
[PATCH] USB serial: add navman driver
[PATCH] USB: Fix irda-usb use after use
[PATCH] USB: rtl8150 small fix
[PATCH] USB: ftdi_sio: add Icom ID1 USB product and vendor ids
[PATCH] USB: cp2101: add new device IDs
[PATCH] USB: fix check_ctrlrecip to allow control transfers in state ADDRESS
[PATCH] USB: vicam.c: fix a NULL pointer dereference
[PATCH] USB: ZC0301 driver bugfix
[PATCH] USB: add support for Creativelabs Silvercrest USB keyboard
[PATCH] USB: storage: new unusual_devs.h entry: Mitsumi 7in1 Card Reader
[PATCH] USB: storage: unusual_devs.h entry 0420:0001
[PATCH] USB: storage: another unusual_devs.h entry
[PATCH] USB: storage: sandisk unusual_devices entry
[PATCH] USB: fix initdata issue in isp116x-hcd
[PATCH] USB: usbcore: usb_set_configuration oops (NULL ptr dereference)
[PATCH] USB: usbcore: Don't assume a USB configuration includes any interfaces
[PATCH] USB: ub 03 drop stall clearing
[PATCH] USB: ub 02 remove diag
[PATCH] USB: ub 01 remove first_open
...
Diffstat (limited to 'drivers/usb/net/pegasus.h')
-rw-r--r-- | drivers/usb/net/pegasus.h | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/drivers/usb/net/pegasus.h b/drivers/usb/net/pegasus.h index 9fbd59b55cb6..a54752ce1493 100644 --- a/drivers/usb/net/pegasus.h +++ b/drivers/usb/net/pegasus.h | |||
@@ -25,7 +25,6 @@ | |||
25 | #define PHY_READ 0x40 | 25 | #define PHY_READ 0x40 |
26 | #define PHY_WRITE 0x20 | 26 | #define PHY_WRITE 0x20 |
27 | #define DEFAULT_GPIO_RESET 0x24 | 27 | #define DEFAULT_GPIO_RESET 0x24 |
28 | #define LINKSYS_GPIO_RESET 0x24 | ||
29 | #define DEFAULT_GPIO_SET 0x26 | 28 | #define DEFAULT_GPIO_SET 0x26 |
30 | 29 | ||
31 | #define PEGASUS_PRESENT 0x00000001 | 30 | #define PEGASUS_PRESENT 0x00000001 |
@@ -140,6 +139,7 @@ struct usb_eth_dev { | |||
140 | #define VENDOR_KINGSTON 0x0951 | 139 | #define VENDOR_KINGSTON 0x0951 |
141 | #define VENDOR_LANEED 0x056e | 140 | #define VENDOR_LANEED 0x056e |
142 | #define VENDOR_LINKSYS 0x066b | 141 | #define VENDOR_LINKSYS 0x066b |
142 | #define VENDOR_LINKSYS2 0x077b | ||
143 | #define VENDOR_MELCO 0x0411 | 143 | #define VENDOR_MELCO 0x0411 |
144 | #define VENDOR_MICROSOFT 0x045e | 144 | #define VENDOR_MICROSOFT 0x045e |
145 | #define VENDOR_MOBILITY 0x1342 | 145 | #define VENDOR_MOBILITY 0x1342 |
@@ -218,15 +218,15 @@ PEGASUS_DEV( "Corega FEter USB-TX", VENDOR_COREGA, 0x0004, | |||
218 | PEGASUS_DEV( "Corega FEter USB-TXS", VENDOR_COREGA, 0x000d, | 218 | PEGASUS_DEV( "Corega FEter USB-TXS", VENDOR_COREGA, 0x000d, |
219 | DEFAULT_GPIO_RESET | PEGASUS_II ) | 219 | DEFAULT_GPIO_RESET | PEGASUS_II ) |
220 | PEGASUS_DEV( "D-Link DSB-650TX", VENDOR_DLINK, 0x4001, | 220 | PEGASUS_DEV( "D-Link DSB-650TX", VENDOR_DLINK, 0x4001, |
221 | LINKSYS_GPIO_RESET ) | 221 | DEFAULT_GPIO_RESET ) |
222 | PEGASUS_DEV( "D-Link DSB-650TX", VENDOR_DLINK, 0x4002, | 222 | PEGASUS_DEV( "D-Link DSB-650TX", VENDOR_DLINK, 0x4002, |
223 | LINKSYS_GPIO_RESET ) | 223 | DEFAULT_GPIO_RESET ) |
224 | PEGASUS_DEV( "D-Link DSB-650TX", VENDOR_DLINK, 0x4102, | 224 | PEGASUS_DEV( "D-Link DSB-650TX", VENDOR_DLINK, 0x4102, |
225 | LINKSYS_GPIO_RESET | PEGASUS_II ) | 225 | DEFAULT_GPIO_RESET | PEGASUS_II ) |
226 | PEGASUS_DEV( "D-Link DSB-650TX", VENDOR_DLINK, 0x400b, | 226 | PEGASUS_DEV( "D-Link DSB-650TX", VENDOR_DLINK, 0x400b, |
227 | LINKSYS_GPIO_RESET | PEGASUS_II ) | 227 | DEFAULT_GPIO_RESET | PEGASUS_II ) |
228 | PEGASUS_DEV( "D-Link DSB-650TX", VENDOR_DLINK, 0x200c, | 228 | PEGASUS_DEV( "D-Link DSB-650TX", VENDOR_DLINK, 0x200c, |
229 | LINKSYS_GPIO_RESET | PEGASUS_II ) | 229 | DEFAULT_GPIO_RESET | PEGASUS_II ) |
230 | PEGASUS_DEV( "D-Link DSB-650TX(PNA)", VENDOR_DLINK, 0x4003, | 230 | PEGASUS_DEV( "D-Link DSB-650TX(PNA)", VENDOR_DLINK, 0x4003, |
231 | DEFAULT_GPIO_RESET | HAS_HOME_PNA ) | 231 | DEFAULT_GPIO_RESET | HAS_HOME_PNA ) |
232 | PEGASUS_DEV( "D-Link DSB-650", VENDOR_DLINK, 0xabc1, | 232 | PEGASUS_DEV( "D-Link DSB-650", VENDOR_DLINK, 0xabc1, |
@@ -260,17 +260,19 @@ PEGASUS_DEV( "LANEED USB Ethernet LD-USB/T", VENDOR_LANEED, 0xabc1, | |||
260 | PEGASUS_DEV( "LANEED USB Ethernet LD-USB/TX", VENDOR_LANEED, 0x200c, | 260 | PEGASUS_DEV( "LANEED USB Ethernet LD-USB/TX", VENDOR_LANEED, 0x200c, |
261 | DEFAULT_GPIO_RESET | PEGASUS_II ) | 261 | DEFAULT_GPIO_RESET | PEGASUS_II ) |
262 | PEGASUS_DEV( "Linksys USB10TX", VENDOR_LINKSYS, 0x2202, | 262 | PEGASUS_DEV( "Linksys USB10TX", VENDOR_LINKSYS, 0x2202, |
263 | LINKSYS_GPIO_RESET ) | 263 | DEFAULT_GPIO_RESET ) |
264 | PEGASUS_DEV( "Linksys USB100TX", VENDOR_LINKSYS, 0x2203, | 264 | PEGASUS_DEV( "Linksys USB100TX", VENDOR_LINKSYS, 0x2203, |
265 | LINKSYS_GPIO_RESET ) | 265 | DEFAULT_GPIO_RESET ) |
266 | PEGASUS_DEV( "Linksys USB100TX", VENDOR_LINKSYS, 0x2204, | 266 | PEGASUS_DEV( "Linksys USB100TX", VENDOR_LINKSYS, 0x2204, |
267 | LINKSYS_GPIO_RESET | HAS_HOME_PNA ) | 267 | DEFAULT_GPIO_RESET | HAS_HOME_PNA ) |
268 | PEGASUS_DEV( "Linksys USB10T Ethernet Adapter", VENDOR_LINKSYS, 0x2206, | 268 | PEGASUS_DEV( "Linksys USB10T Ethernet Adapter", VENDOR_LINKSYS, 0x2206, |
269 | LINKSYS_GPIO_RESET | PEGASUS_II) | 269 | DEFAULT_GPIO_RESET | PEGASUS_II) |
270 | PEGASUS_DEV( "Linksys USBVPN1", VENDOR_LINKSYS2, 0x08b4, | ||
271 | DEFAULT_GPIO_RESET ) | ||
270 | PEGASUS_DEV( "Linksys USB USB100TX", VENDOR_LINKSYS, 0x400b, | 272 | PEGASUS_DEV( "Linksys USB USB100TX", VENDOR_LINKSYS, 0x400b, |
271 | LINKSYS_GPIO_RESET | PEGASUS_II ) | 273 | DEFAULT_GPIO_RESET | PEGASUS_II ) |
272 | PEGASUS_DEV( "Linksys USB10TX", VENDOR_LINKSYS, 0x200c, | 274 | PEGASUS_DEV( "Linksys USB10TX", VENDOR_LINKSYS, 0x200c, |
273 | LINKSYS_GPIO_RESET | PEGASUS_II ) | 275 | DEFAULT_GPIO_RESET | PEGASUS_II ) |
274 | PEGASUS_DEV( "MELCO/BUFFALO LUA-TX", VENDOR_MELCO, 0x0001, | 276 | PEGASUS_DEV( "MELCO/BUFFALO LUA-TX", VENDOR_MELCO, 0x0001, |
275 | DEFAULT_GPIO_RESET ) | 277 | DEFAULT_GPIO_RESET ) |
276 | PEGASUS_DEV( "MELCO/BUFFALO LUA-TX", VENDOR_MELCO, 0x0005, | 278 | PEGASUS_DEV( "MELCO/BUFFALO LUA-TX", VENDOR_MELCO, 0x0005, |