diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2008-08-07 16:52:52 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2008-08-07 16:52:52 +0000 |
| commit | e5fa05d78819686d0ce026de236cdeaaab91f0a4 (patch) | |
| tree | 08d1f7dd25c02ad1391e6694a83f929b5761b47e /target/linux/generic-2.6/patches-2.6.26 | |
| parent | c05eb4ba633caf6485c8df6544a28c1548b7bc44 (diff) | |
| download | upstream-e5fa05d78819686d0ce026de236cdeaaab91f0a4.tar.gz upstream-e5fa05d78819686d0ce026de236cdeaaab91f0a4.tar.bz2 upstream-e5fa05d78819686d0ce026de236cdeaaab91f0a4.zip | |
update to 2.6.25.15 and 2.6.26.2
SVN-Revision: 12242
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.26')
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.26/402-ledtrig_netdev.patch | 12 | ||||
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.26/801-usb_serial_endpoint_size.patch | 4 |
2 files changed, 6 insertions, 10 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.26/402-ledtrig_netdev.patch b/target/linux/generic-2.6/patches-2.6.26/402-ledtrig_netdev.patch index 1dcdad6583..8a564b2ec8 100644 --- a/target/linux/generic-2.6/patches-2.6.26/402-ledtrig_netdev.patch +++ b/target/linux/generic-2.6/patches-2.6.26/402-ledtrig_netdev.patch @@ -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 diff --git a/target/linux/generic-2.6/patches-2.6.26/801-usb_serial_endpoint_size.patch b/target/linux/generic-2.6/patches-2.6.26/801-usb_serial_endpoint_size.patch index e856dc120a..f1bd446bd5 100644 --- a/target/linux/generic-2.6/patches-2.6.26/801-usb_serial_endpoint_size.patch +++ b/target/linux/generic-2.6/patches-2.6.26/801-usb_serial_endpoint_size.patch @@ -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"); |