diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-29 00:08:14 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-29 00:08:14 -0400 |
| commit | 1f419cadff55f548e7356ffebdb9e1b5a8c22275 (patch) | |
| tree | 07c04d053322e9913a6b445b2fe00510299e97cf /drivers/usb/net/pegasus.h | |
| parent | 974f7bc5781d3fc16e32d8908c6e48592e767dd2 (diff) | |
| parent | 4303fc6f055cf1a7ec63c3c3fd777b91b7d576f1 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
Diffstat (limited to 'drivers/usb/net/pegasus.h')
| -rw-r--r-- | drivers/usb/net/pegasus.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/net/pegasus.h b/drivers/usb/net/pegasus.h index b98f2a833442..9fbd59b55cb6 100644 --- a/drivers/usb/net/pegasus.h +++ b/drivers/usb/net/pegasus.h | |||
| @@ -181,6 +181,8 @@ PEGASUS_DEV( "Accton USB 10/100 Ethernet Adapter", VENDOR_ACCTON, 0x1046, | |||
| 181 | DEFAULT_GPIO_RESET ) | 181 | DEFAULT_GPIO_RESET ) |
| 182 | PEGASUS_DEV( "SpeedStream USB 10/100 Ethernet", VENDOR_ACCTON, 0x5046, | 182 | PEGASUS_DEV( "SpeedStream USB 10/100 Ethernet", VENDOR_ACCTON, 0x5046, |
| 183 | DEFAULT_GPIO_RESET | PEGASUS_II ) | 183 | DEFAULT_GPIO_RESET | PEGASUS_II ) |
| 184 | PEGASUS_DEV( "Philips USB 10/100 Ethernet", VENDOR_ACCTON, 0xb004, | ||
| 185 | DEFAULT_GPIO_RESET | PEGASUS_II ) | ||
| 184 | PEGASUS_DEV( "ADMtek ADM8511 \"Pegasus II\" USB Ethernet", | 186 | PEGASUS_DEV( "ADMtek ADM8511 \"Pegasus II\" USB Ethernet", |
| 185 | VENDOR_ADMTEK, 0x8511, | 187 | VENDOR_ADMTEK, 0x8511, |
| 186 | DEFAULT_GPIO_RESET | PEGASUS_II | HAS_HOME_PNA ) | 188 | DEFAULT_GPIO_RESET | PEGASUS_II | HAS_HOME_PNA ) |