diff options
| author | David S. Miller <davem@davemloft.net> | 2010-09-09 22:27:33 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-09-09 22:27:33 -0700 |
| commit | e548833df83c3554229eff0672900bfe958b45fd (patch) | |
| tree | 85efc4a76dc356593d6d394776aeb845dc580fb6 /drivers/usb/serial/pl2303.h | |
| parent | cbd9da7be869f676afc204e1a664163778c770bd (diff) | |
| parent | 053d8f6622701f849fda2ca2c9ae596c13599ba9 (diff) | |
| download | kernel_samsung_smdk4412-e548833df83c3554229eff0672900bfe958b45fd.zip kernel_samsung_smdk4412-e548833df83c3554229eff0672900bfe958b45fd.tar.gz kernel_samsung_smdk4412-e548833df83c3554229eff0672900bfe958b45fd.tar.bz2 | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/mac80211/main.c
Diffstat (limited to 'drivers/usb/serial/pl2303.h')
| -rw-r--r-- | drivers/usb/serial/pl2303.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/usb/serial/pl2303.h b/drivers/usb/serial/pl2303.h index a871645..43eb9bd 100644 --- a/drivers/usb/serial/pl2303.h +++ b/drivers/usb/serial/pl2303.h @@ -128,6 +128,10 @@ #define CRESSI_VENDOR_ID 0x04b8 #define CRESSI_EDY_PRODUCT_ID 0x0521 +/* Zeagle dive computer interface */ +#define ZEAGLE_VENDOR_ID 0x04b8 +#define ZEAGLE_N2ITION3_PRODUCT_ID 0x0522 + /* Sony, USB data cable for CMD-Jxx mobile phones */ #define SONY_VENDOR_ID 0x054c #define SONY_QN3USB_PRODUCT_ID 0x0437 |