diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2007-02-10 01:26:32 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2007-02-10 01:26:32 -0500 |
| commit | b22364c8eec89e6b0c081a237f3b6348df87796f (patch) | |
| tree | 233a923281fb640106465d076997ff511efb6edf /drivers/usb/net/pegasus.h | |
| parent | 2c8dc071517ec2843869024dc82be2e246f41064 (diff) | |
| parent | 66efc5a7e3061c3597ac43a8bb1026488d57e66b (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/usb/net/pegasus.h')
| -rw-r--r-- | drivers/usb/net/pegasus.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/net/pegasus.h b/drivers/usb/net/pegasus.h index 98f6898cae1f..c7467823cd1c 100644 --- a/drivers/usb/net/pegasus.h +++ b/drivers/usb/net/pegasus.h | |||
| @@ -214,9 +214,9 @@ PEGASUS_DEV( "Billionton USBEL-100", VENDOR_BILLIONTON, 0x0988, | |||
| 214 | DEFAULT_GPIO_RESET ) | 214 | DEFAULT_GPIO_RESET ) |
| 215 | PEGASUS_DEV( "Billionton USBE-100", VENDOR_BILLIONTON, 0x8511, | 215 | PEGASUS_DEV( "Billionton USBE-100", VENDOR_BILLIONTON, 0x8511, |
| 216 | DEFAULT_GPIO_RESET | PEGASUS_II ) | 216 | DEFAULT_GPIO_RESET | PEGASUS_II ) |
| 217 | PEGASUS_DEV( "Corega FEter USB-TX", VENDOR_COREGA, 0x0004, | 217 | PEGASUS_DEV( "Corega FEther USB-TX", VENDOR_COREGA, 0x0004, |
| 218 | DEFAULT_GPIO_RESET ) | 218 | DEFAULT_GPIO_RESET ) |
| 219 | PEGASUS_DEV( "Corega FEter USB-TXS", VENDOR_COREGA, 0x000d, | 219 | PEGASUS_DEV( "Corega FEther USB-TXS", VENDOR_COREGA, 0x000d, |
| 220 | DEFAULT_GPIO_RESET | PEGASUS_II ) | 220 | DEFAULT_GPIO_RESET | PEGASUS_II ) |
| 221 | PEGASUS_DEV( "D-Link DSB-650TX", VENDOR_DLINK, 0x4001, | 221 | PEGASUS_DEV( "D-Link DSB-650TX", VENDOR_DLINK, 0x4001, |
| 222 | DEFAULT_GPIO_RESET ) | 222 | DEFAULT_GPIO_RESET ) |