diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-06 16:25:32 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-06 16:25:32 -0700 |
| commit | b2267928115c563206ff006eb83e7935b7565eec (patch) | |
| tree | 9bde67c65534c1711480385e9acaf67630be1ed9 /usb | |
| parent | 24422233277d7b2b940fa93e7374d881063a6cff (diff) | |
| download | patches-b2267928115c563206ff006eb83e7935b7565eec.tar.gz | |
i2c patches and remove kevent patch
Diffstat (limited to 'usb')
| -rw-r--r-- | usb/usb-convert-the-semaphores-in-the-sisusb-driver-to-mutexes.patch | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/usb/usb-convert-the-semaphores-in-the-sisusb-driver-to-mutexes.patch b/usb/usb-convert-the-semaphores-in-the-sisusb-driver-to-mutexes.patch index d5d571a90fb7a..8e7fe6f4db8b0 100644 --- a/usb/usb-convert-the-semaphores-in-the-sisusb-driver-to-mutexes.patch +++ b/usb/usb-convert-the-semaphores-in-the-sisusb-driver-to-mutexes.patch @@ -20,9 +20,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- drivers/usb/misc/sisusbvga/sisusb.c | 77 +++++++++---------- - drivers/usb/misc/sisusbvga/sisusb.h | 4 + drivers/usb/misc/sisusbvga/sisusb.h | 6 - drivers/usb/misc/sisusbvga/sisusb_con.c | 129 ++++++++++++++++---------------- - 3 files changed, 107 insertions(+), 103 deletions(-) + 3 files changed, 107 insertions(+), 105 deletions(-) --- gregkh-2.6.orig/drivers/usb/misc/sisusbvga/sisusb.c +++ gregkh-2.6/drivers/usb/misc/sisusbvga/sisusb.c @@ -301,7 +301,19 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* For older kernels, support for text consoles is by default * off. To ensable text console support, change the following: */ -@@ -116,7 +118,7 @@ struct sisusb_usb_data { +@@ -60,11 +62,9 @@ + #define INCL_SISUSB_CON 1 + #endif + +-#ifdef INCL_SISUSB_CON + #include <linux/console.h> + #include <linux/vt_kern.h> + #include "sisusb_struct.h" +-#endif + + /* USB related */ + +@@ -116,7 +116,7 @@ struct sisusb_usb_data { struct usb_interface *interface; struct kref kref; wait_queue_head_t wait_q; /* for syncind and timeouts */ |