diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-11 09:05:36 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-11 09:05:36 -0800 |
| commit | c4a28a4f7fe1269989bb7e46f14231ef67316bb3 (patch) | |
| tree | 26077cad438d73ac50dbf12f9727716e183f5ee4 /usb | |
| parent | 91a2cf51903acbc90f5b4d2453ddcafa09f8d20a (diff) | |
| download | patches-c4a28a4f7fe1269989bb7e46f14231ef67316bb3.tar.gz | |
2.6.15-git7 refresh
Diffstat (limited to 'usb')
| -rw-r--r-- | usb/usb-add-et61x51-video4linux2-driver.patch | 8 | ||||
| -rw-r--r-- | usb/usb-fix-oops-in-acm-disconnect.patch | 4 | ||||
| -rw-r--r-- | usb/usb-gotemp.patch | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/usb/usb-add-et61x51-video4linux2-driver.patch b/usb/usb-add-et61x51-video4linux2-driver.patch index bbec13a7e53ad..a0c6e2d3a9b28 100644 --- a/usb/usb-add-et61x51-video4linux2-driver.patch +++ b/usb/usb-add-et61x51-video4linux2-driver.patch @@ -3480,7 +3480,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> obj-$(CONFIG_USB_OV511) += ov511.o --- gregkh-2.6.orig/include/linux/videodev2.h +++ gregkh-2.6/include/linux/videodev2.h -@@ -314,6 +314,7 @@ struct v4l2_pix_format +@@ -315,6 +315,7 @@ struct v4l2_pix_format #define V4L2_PIX_FMT_SN9C10X v4l2_fourcc('S','9','1','0') /* SN9C10x compression */ #define V4L2_PIX_FMT_PWC1 v4l2_fourcc('P','W','C','1') /* pwc older webcam */ #define V4L2_PIX_FMT_PWC2 v4l2_fourcc('P','W','C','2') /* pwc newer webcam */ @@ -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 -@@ -2641,6 +2641,14 @@ M: dbrownell@users.sourceforge.net +@@ -2642,6 +2642,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 -@@ -2804,6 +2812,7 @@ USB SN9C10x DRIVER +@@ -2805,6 +2813,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 -@@ -2833,6 +2842,7 @@ USB W996[87]CF DRIVER +@@ -2834,6 +2843,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-fix-oops-in-acm-disconnect.patch b/usb/usb-fix-oops-in-acm-disconnect.patch index 5a6ac81508743..e53eaa1255aef 100644 --- a/usb/usb-fix-oops-in-acm-disconnect.patch +++ b/usb/usb-fix-oops-in-acm-disconnect.patch @@ -17,7 +17,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/drivers/usb/class/cdc-acm.c +++ gregkh-2.6/drivers/usb/class/cdc-acm.c -@@ -1019,8 +1019,13 @@ static void acm_disconnect(struct usb_in +@@ -1014,8 +1014,13 @@ static void acm_disconnect(struct usb_in } down(&open_sem); @@ -32,7 +32,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> tasklet_disable(&acm->urb_task); -@@ -1041,7 +1046,7 @@ static void acm_disconnect(struct usb_in +@@ -1036,7 +1041,7 @@ static void acm_disconnect(struct usb_in for (i = 0; i < ACM_NRB; i++) usb_buffer_free(usb_dev, acm->readsize, acm->rb[i].base, acm->rb[i].dma); diff --git a/usb/usb-gotemp.patch b/usb/usb-gotemp.patch index c839db023b563..193760b9830fa 100644 --- a/usb/usb-gotemp.patch +++ b/usb/usb-gotemp.patch @@ -331,7 +331,7 @@ +MODULE_LICENSE("GPL"); --- gregkh-2.6.orig/drivers/usb/Makefile +++ gregkh-2.6/drivers/usb/Makefile -@@ -64,6 +64,7 @@ obj-$(CONFIG_USB_AUERSWALD) += misc/ +@@ -65,6 +65,7 @@ obj-$(CONFIG_USB_AUERSWALD) += misc/ obj-$(CONFIG_USB_CYTHERM) += misc/ obj-$(CONFIG_USB_EMI26) += misc/ obj-$(CONFIG_USB_EMI62) += misc/ |