diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-07 02:53:30 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-07 02:53:30 -0400 |
| commit | 4a35ecf8bf1c4b039503fa554100fe85c761de76 (patch) | |
| tree | 9b75f5d5636004d9a9aa496924377379be09aa1f /drivers/usb/serial/ftdi_sio_ids.h | |
| parent | b4d562e3c3553ac58c7120555c4e4aefbb090a2a (diff) | |
| parent | fb9e2d887243499b8d28efcf80821c4f6a092395 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/bonding/bond_main.c
drivers/net/via-velocity.c
drivers/net/wireless/iwlwifi/iwl-agn.c
Diffstat (limited to 'drivers/usb/serial/ftdi_sio_ids.h')
| -rw-r--r-- | drivers/usb/serial/ftdi_sio_ids.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h index 0727e198503e..75482cbc3998 100644 --- a/drivers/usb/serial/ftdi_sio_ids.h +++ b/drivers/usb/serial/ftdi_sio_ids.h | |||
| @@ -501,6 +501,13 @@ | |||
| 501 | #define CONTEC_COM1USBH_PID 0x8311 /* COM-1(USB)H */ | 501 | #define CONTEC_COM1USBH_PID 0x8311 /* COM-1(USB)H */ |
| 502 | 502 | ||
| 503 | /* | 503 | /* |
| 504 | * Contec products (http://www.contec.com) | ||
| 505 | * Submitted by Daniel Sangorrin | ||
| 506 | */ | ||
| 507 | #define CONTEC_VID 0x06CE /* Vendor ID */ | ||
| 508 | #define CONTEC_COM1USBH_PID 0x8311 /* COM-1(USB)H */ | ||
| 509 | |||
| 510 | /* | ||
| 504 | * Definitions for B&B Electronics products. | 511 | * Definitions for B&B Electronics products. |
| 505 | */ | 512 | */ |
| 506 | #define BANDB_VID 0x0856 /* B&B Electronics Vendor ID */ | 513 | #define BANDB_VID 0x0856 /* B&B Electronics Vendor ID */ |