aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/at91
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2008-08-22 15:37:19 +0000
committerGabor Juhos <juhosg@openwrt.org>2008-08-22 15:37:19 +0000
commit80b1408ef97a63e0d1e3977cefecd00f9c085959 (patch)
tree074f7229f0cedb176a1a09354cbf032ed532b025 /target/linux/at91
parent54bcffc5e08f2cad6854dbdfaa05d597d1df0a8b (diff)
downloadmaster-187ad058-80b1408ef97a63e0d1e3977cefecd00f9c085959.tar.gz
master-187ad058-80b1408ef97a63e0d1e3977cefecd00f9c085959.tar.bz2
master-187ad058-80b1408ef97a63e0d1e3977cefecd00f9c085959.zip
[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 90d10088d5..4385a1763a 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 412490ffa1..d698763c68 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;
}