summaryrefslogtreecommitdiffstats
path: root/target/linux/at91
diff options
context:
space:
mode:
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-08-22 15:37:19 +0000
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-08-22 15:37:19 +0000
commit679527596194ec4222e9379d386061ada4744900 (patch)
tree074f7229f0cedb176a1a09354cbf032ed532b025 /target/linux/at91
parentac9bdf20c8c0e8f419cff3061aa1e3459c6c4e1e (diff)
[kernel] update to 2.6.26.3 and 2.6.25.16
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12371 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/at91')
-rw-r--r--target/linux/at91/Makefile2
-rw-r--r--target/linux/at91/patches-2.6.25/017-usb_serial_endpoint_size.patch2
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/at91/Makefile b/target/linux/at91/Makefile
index 90d10088d..4385a1763 100644
--- a/target/linux/at91/Makefile
+++ b/target/linux/at91/Makefile
@@ -11,7 +11,7 @@ BOARD:=at91
BOARDNAME:=Atmel AT91
FEATURES:=squashfs usb
-LINUX_VERSION:=2.6.25.15
+LINUX_VERSION:=2.6.25.16
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/at91/patches-2.6.25/017-usb_serial_endpoint_size.patch b/target/linux/at91/patches-2.6.25/017-usb_serial_endpoint_size.patch
index 412490ffa..d698763c6 100644
--- a/target/linux/at91/patches-2.6.25/017-usb_serial_endpoint_size.patch
+++ b/target/linux/at91/patches-2.6.25/017-usb_serial_endpoint_size.patch
@@ -1,6 +1,6 @@
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
-@@ -905,7 +905,7 @@
+@@ -904,7 +904,7 @@
dev_err(&interface->dev, "No free urbs available\n");
goto probe_error;
}