| From stable-bounces@linux.kernel.org Wed Aug 13 20:55:29 2008 |
| From: Andre Schenk <andre@melior.s.bawue.de> |
| Date: Thu, 14 Aug 2008 03:55:19 GMT |
| Subject: USB: ftdi_sio: Add USB Product Id for ELV HS485 |
| To: jejb@kernel.org, stable@kernel.org |
| Message-ID: <200808140355.m7E3tJ2o011876@hera.kernel.org> |
| |
| From: Andre Schenk <andre@melior.s.bawue.de> |
| |
| commit b5894a500127fce1db1309db5f9ca8b77a2ac266 upstream |
| |
| USB product id registration for the ELV HS485 USB adapter (www.elv.de) to |
| their home automation bus system. Applies to 2.6.26. |
| |
| Signed-off-by: Andre Schenk <andre@melior.s.bawue.de> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| drivers/usb/serial/ftdi_sio.c | 1 + |
| drivers/usb/serial/ftdi_sio.h | 1 + |
| 2 files changed, 2 insertions(+) |
| |
| --- a/drivers/usb/serial/ftdi_sio.c |
| +++ b/drivers/usb/serial/ftdi_sio.c |
| @@ -553,6 +553,7 @@ static struct usb_device_id id_table_com |
| { USB_DEVICE(FTDI_VID, FTDI_ELV_FHZ1300PC_PID) }, |
| { USB_DEVICE(FTDI_VID, FTDI_ELV_EM1010PC_PID) }, |
| { USB_DEVICE(FTDI_VID, FTDI_ELV_WS500_PID) }, |
| + { USB_DEVICE(FTDI_VID, FTDI_ELV_HS485_PID) }, |
| { USB_DEVICE(FTDI_VID, LINX_SDMUSBQSS_PID) }, |
| { USB_DEVICE(FTDI_VID, LINX_MASTERDEVEL2_PID) }, |
| { USB_DEVICE(FTDI_VID, LINX_FUTURE_0_PID) }, |
| --- a/drivers/usb/serial/ftdi_sio.h |
| +++ b/drivers/usb/serial/ftdi_sio.h |
| @@ -524,6 +524,7 @@ |
| #define FTDI_ELV_WS300PC_PID 0xE0F6 /* PC-Wetterstation (WS 300 PC) */ |
| #define FTDI_ELV_FHZ1300PC_PID 0xE0E8 /* FHZ 1300 PC */ |
| #define FTDI_ELV_WS500_PID 0xE0E9 /* PC-Wetterstation (WS 500) */ |
| +#define FTDI_ELV_HS485_PID 0xE0EA /* USB to RS-485 adapter */ |
| #define FTDI_ELV_EM1010PC_PID 0xE0EF /* Engery monitor EM 1010 PC */ |
| |
| /* |