From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Mon, 1 Aug 2011 17:32:43 +0000 (-0700)
Subject: .2.6.39 patches
X-Git-Tag: v2.6.39.4~25
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6d92c0f6122d54ae910380c2d6c84a95b8d895a0;p=thirdparty%2Fkernel%2Fstable-queue.git

.2.6.39 patches
---

diff --git a/queue-2.6.39/series b/queue-2.6.39/series
index 7d64a037dd9..d890ce02cbe 100644
--- a/queue-2.6.39/series
+++ b/queue-2.6.39/series
@@ -1,3 +1,4 @@
+usb-serial-add-ids-for-winchiphead-usb-rs232-adapter.patch
 drm-radeon-kms-free-ib-pool-on-module-unloading.patch
 drm-radeon-kms-fix-typo-in-evergreen-disp-int-status.patch
 drm-radeon-kms-fix-typo-in-ih_cntl-swap-bitfield.patch
diff --git a/queue-2.6.39/usb-serial-add-ids-for-winchiphead-usb-rs232-adapter.patch b/queue-2.6.39/usb-serial-add-ids-for-winchiphead-usb-rs232-adapter.patch
new file mode 100644
index 00000000000..d0b9bc59532
--- /dev/null
+++ b/queue-2.6.39/usb-serial-add-ids-for-winchiphead-usb-rs232-adapter.patch
@@ -0,0 +1,40 @@
+From 026dfaf18973404a01f488d6aa556a8c466e06a4 Mon Sep 17 00:00:00 2001
+From: Wolfgang Denk <wd@denx.de>
+Date: Tue, 19 Jul 2011 11:25:38 +0200
+Subject: USB: serial: add IDs for WinChipHead USB->RS232 adapter
+
+From: Wolfgang Denk <wd@denx.de>
+
+commit 026dfaf18973404a01f488d6aa556a8c466e06a4 upstream.
+
+Add ID 4348:5523 for WinChipHead USB->RS 232 adapter with
+Prolifec PL2303 chipset
+
+Signed-off-by: Wolfgang Denk <wd@denx.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/usb/serial/pl2303.c |    1 +
+ drivers/usb/serial/pl2303.h |    4 ++++
+ 2 files changed, 5 insertions(+)
+
+--- a/drivers/usb/serial/pl2303.c
++++ b/drivers/usb/serial/pl2303.c
+@@ -91,6 +91,7 @@ static const struct usb_device_id id_tab
+ 	{ USB_DEVICE(SONY_VENDOR_ID, SONY_QN3USB_PRODUCT_ID) },
+ 	{ USB_DEVICE(SANWA_VENDOR_ID, SANWA_PRODUCT_ID) },
+ 	{ USB_DEVICE(ADLINK_VENDOR_ID, ADLINK_ND6530_PRODUCT_ID) },
++	{ USB_DEVICE(WINCHIPHEAD_VENDOR_ID, WINCHIPHEAD_USBSER_PRODUCT_ID) },
+ 	{ }					/* Terminating entry */
+ };
+ 
+--- a/drivers/usb/serial/pl2303.h
++++ b/drivers/usb/serial/pl2303.h
+@@ -144,3 +144,7 @@
+ /* ADLINK ND-6530 RS232,RS485 and RS422 adapter */
+ #define ADLINK_VENDOR_ID		0x0b63
+ #define ADLINK_ND6530_PRODUCT_ID	0x6530
++
++/* WinChipHead USB->RS 232 adapter */
++#define WINCHIPHEAD_VENDOR_ID		0x4348
++#define WINCHIPHEAD_USBSER_PRODUCT_ID	0x5523