diff options
author | John W. Linville <linville@tuxdriver.com> | 2006-09-11 14:08:41 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2006-09-11 14:08:41 -0400 |
commit | 623b3e1d645e42030897d18d37db10133d763006 (patch) | |
tree | 090ff481cd72b47ff87d50615461712a33ba41e6 /drivers/usb/net/pegasus.h | |
parent | c576af479162c0a11d4e2691ebc97354958d9285 (diff) | |
parent | 38f5745c5a90641079fd5b48600ae63f7ab6edcd (diff) |
Merge branch 'from-linus' into upstream
Diffstat (limited to 'drivers/usb/net/pegasus.h')
-rw-r--r-- | drivers/usb/net/pegasus.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/net/pegasus.h b/drivers/usb/net/pegasus.h index a54752ce149..006438069b6 100644 --- a/drivers/usb/net/pegasus.h +++ b/drivers/usb/net/pegasus.h @@ -131,6 +131,7 @@ struct usb_eth_dev { #define VENDOR_COREGA 0x07aa #define VENDOR_DLINK 0x2001 #define VENDOR_ELCON 0x0db7 +#define VENDOR_ELECOM 0x056e #define VENDOR_ELSA 0x05cc #define VENDOR_GIGABYTE 0x1044 #define VENDOR_HAWKING 0x0e66 @@ -233,6 +234,8 @@ PEGASUS_DEV( "D-Link DSB-650", VENDOR_DLINK, 0xabc1, DEFAULT_GPIO_RESET ) PEGASUS_DEV( "GOLDPFEIL USB Adapter", VENDOR_ELCON, 0x0002, DEFAULT_GPIO_RESET | PEGASUS_II | HAS_HOME_PNA ) +PEGASUS_DEV( "ELECOM USB Ethernet LD-USB20", VENDOR_ELECOM, 0x4010, + DEFAULT_GPIO_RESET | PEGASUS_II ) PEGASUS_DEV( "EasiDock Ethernet", VENDOR_MOBILITY, 0x0304, DEFAULT_GPIO_RESET ) PEGASUS_DEV( "Elsa Micolink USB2Ethernet", VENDOR_ELSA, 0x3000, |