update to 2.6.25.15 and 2.6.26.2
SVN-Revision: 12242
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
--- linux-2.6.25.12/drivers/usb/class/cdc-acm.c 2008-07-24 18:14:20.000000000 +0200
|
||||
+++ linux-2.6.25.12.new/drivers/usb/class/cdc-acm.c 2008-08-05 21:39:35.000000000 +0200
|
||||
--- a/drivers/usb/class/cdc-acm.c
|
||||
+++ b/drivers/usb/class/cdc-acm.c
|
||||
@@ -531,8 +531,8 @@
|
||||
tasklet_schedule(&acm->urb_task);
|
||||
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
Index: linux-2.6.26/drivers/leds/Kconfig
|
||||
===================================================================
|
||||
--- linux-2.6.26.orig/drivers/leds/Kconfig 2008-08-04 15:03:44.000000000 +0200
|
||||
+++ linux-2.6.26/drivers/leds/Kconfig 2008-08-04 15:04:18.000000000 +0200
|
||||
--- a/drivers/leds/Kconfig
|
||||
+++ b/drivers/leds/Kconfig
|
||||
@@ -200,4 +200,11 @@
|
||||
tristate "LED Morse Trigger"
|
||||
depends on LEDS_TRIGGERS
|
||||
@@ -14,10 +12,8 @@ Index: linux-2.6.26/drivers/leds/Kconfig
|
||||
+ If unsure, say Y.
|
||||
+
|
||||
endif # NEW_LEDS
|
||||
Index: linux-2.6.26/drivers/leds/Makefile
|
||||
===================================================================
|
||||
--- linux-2.6.26.orig/drivers/leds/Makefile 2008-08-04 15:03:40.000000000 +0200
|
||||
+++ linux-2.6.26/drivers/leds/Makefile 2008-08-04 15:04:29.000000000 +0200
|
||||
--- a/drivers/leds/Makefile
|
||||
+++ b/drivers/leds/Makefile
|
||||
@@ -29,3 +29,4 @@
|
||||
obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT) += ledtrig-heartbeat.o
|
||||
obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
static int debug;
|
||||
static struct usb_serial *serial_table[SERIAL_TTY_MINORS]; /* initially all NULL */
|
||||
static DEFINE_MUTEX(table_lock);
|
||||
@@ -812,7 +813,7 @@
|
||||
@@ -815,7 +816,7 @@
|
||||
dev_err(&interface->dev, "No free urbs available\n");
|
||||
goto probe_error;
|
||||
}
|
||||
@@ -17,7 +17,7 @@
|
||||
port->bulk_in_size = buffer_size;
|
||||
port->bulk_in_endpointAddress = endpoint->bEndpointAddress;
|
||||
port->bulk_in_buffer = kmalloc (buffer_size, GFP_KERNEL);
|
||||
@@ -1226,3 +1227,5 @@
|
||||
@@ -1229,3 +1230,5 @@
|
||||
|
||||
module_param(debug, bool, S_IRUGO | S_IWUSR);
|
||||
MODULE_PARM_DESC(debug, "Debug enabled or not");
|
||||
|
||||
Reference in New Issue
Block a user