diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-16 11:33:25 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-16 11:33:25 -0800 |
| commit | dd9de0f69397dc638de28b8a92b13b9a3a290e3b (patch) | |
| tree | 917eb06d87ed1c38c963b3d6e45e1fa743d313ef /usb | |
| parent | f08129a3698a4d5c6ef35cd88d8304eda01f8fd3 (diff) | |
| download | patches-dd9de0f69397dc638de28b8a92b13b9a3a290e3b.tar.gz | |
2.6.15-git12 resync
Diffstat (limited to 'usb')
| -rw-r--r-- | usb/usb-add-et61x51-video4linux2-driver.patch | 6 | ||||
| -rw-r--r-- | usb/usb-convert-a-bunch-of-usb-semaphores-to-mutexes.patch | 14 | ||||
| -rw-r--r-- | usb/usb-pl2303-added-support-for-ca-42-clone-cable.patch | 2 |
3 files changed, 5 insertions, 17 deletions
diff --git a/usb/usb-add-et61x51-video4linux2-driver.patch b/usb/usb-add-et61x51-video4linux2-driver.patch index fe94fbca7f95d..9906f896e570e 100644 --- a/usb/usb-add-et61x51-video4linux2-driver.patch +++ b/usb/usb-add-et61x51-video4linux2-driver.patch @@ -3490,7 +3490,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> * F O R M A T E N U M E R A T I O N --- gregkh-2.6.orig/MAINTAINERS +++ gregkh-2.6/MAINTAINERS -@@ -2635,6 +2635,14 @@ M: dbrownell@users.sourceforge.net +@@ -2661,6 +2661,14 @@ M: dbrownell@users.sourceforge.net L: linux-usb-devel@lists.sourceforge.net S: Maintained @@ -3505,7 +3505,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> USB HID/HIDBP DRIVERS P: Vojtech Pavlik M: vojtech@suse.cz -@@ -2798,6 +2806,7 @@ USB SN9C10x DRIVER +@@ -2824,6 +2832,7 @@ USB SN9C10x DRIVER P: Luca Risolia M: luca.risolia@studio.unibo.it L: linux-usb-devel@lists.sourceforge.net @@ -3513,7 +3513,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> W: http://www.linux-projects.org S: Maintained -@@ -2827,6 +2836,7 @@ USB W996[87]CF DRIVER +@@ -2853,6 +2862,7 @@ USB W996[87]CF DRIVER P: Luca Risolia M: luca.risolia@studio.unibo.it L: linux-usb-devel@lists.sourceforge.net diff --git a/usb/usb-convert-a-bunch-of-usb-semaphores-to-mutexes.patch b/usb/usb-convert-a-bunch-of-usb-semaphores-to-mutexes.patch index 6083093b7aeb6..0e7c4961ba6c3 100644 --- a/usb/usb-convert-a-bunch-of-usb-semaphores-to-mutexes.patch +++ b/usb/usb-convert-a-bunch-of-usb-semaphores-to-mutexes.patch @@ -49,11 +49,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> drivers/usb/mon/mon_main.c | 19 ++-- drivers/usb/mon/mon_text.c | 21 ++--- drivers/usb/mon/usb_mon.h | 2 - drivers/usb/serial/pl2303.c | 2 drivers/usb/storage/scsiglue.c | 9 +- drivers/usb/storage/usb.c | 25 +++--- drivers/usb/storage/usb.h | 5 - - 39 files changed, 414 insertions(+), 396 deletions(-) + 38 files changed, 414 insertions(+), 394 deletions(-) --- gregkh-2.6.orig/drivers/usb/class/cdc-acm.c +++ gregkh-2.6/drivers/usb/class/cdc-acm.c @@ -547,17 +546,6 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> info("LEGO USB Tower #%d now disconnected", (minor - LEGO_USB_TOWER_MINOR_BASE)); ---- gregkh-2.6.orig/drivers/usb/serial/pl2303.c -+++ gregkh-2.6/drivers/usb/serial/pl2303.c -@@ -43,8 +43,6 @@ static int debug; - #define PL2303_BUF_SIZE 1024 - #define PL2303_TMP_BUF_SIZE 1024 - --static DECLARE_MUTEX(pl2303_tmp_buf_sem); -- - struct pl2303_buf { - unsigned int buf_size; - char *buf_buf; --- gregkh-2.6.orig/drivers/usb/mon/mon_main.c +++ gregkh-2.6/drivers/usb/mon/mon_main.c @@ -12,6 +12,7 @@ diff --git a/usb/usb-pl2303-added-support-for-ca-42-clone-cable.patch b/usb/usb-pl2303-added-support-for-ca-42-clone-cable.patch index dea2f94d92ece..8de18aea38f32 100644 --- a/usb/usb-pl2303-added-support-for-ca-42-clone-cable.patch +++ b/usb/usb-pl2303-added-support-for-ca-42-clone-cable.patch @@ -17,7 +17,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/drivers/usb/serial/pl2303.c +++ gregkh-2.6/drivers/usb/serial/pl2303.c -@@ -75,7 +75,8 @@ static struct usb_device_id id_table [] +@@ -73,7 +73,8 @@ static struct usb_device_id id_table [] { USB_DEVICE(SIEMENS_VENDOR_ID, SIEMENS_PRODUCT_ID_X65) }, { USB_DEVICE(SIEMENS_VENDOR_ID, SIEMENS_PRODUCT_ID_X75) }, { USB_DEVICE(SYNTECH_VENDOR_ID, SYNTECH_PRODUCT_ID) }, |