aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm2708/patches-3.10/016-amba-pl011-fifosize.patch
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2013-07-22 15:31:13 +0000
committerGabor Juhos <juhosg@openwrt.org>2013-07-22 15:31:13 +0000
commit2c55674246b6f7600f86df516360f6e91fa11082 (patch)
tree4f0d9ddb998524a799908ecc74c5ba1e063d17c2 /target/linux/brcm2708/patches-3.10/016-amba-pl011-fifosize.patch
parentfcc7d8f722c8803f1d7555fc27638c72ad6a561a (diff)
downloadmaster-187ad058-2c55674246b6f7600f86df516360f6e91fa11082.tar.gz
master-187ad058-2c55674246b6f7600f86df516360f6e91fa11082.tar.bz2
master-187ad058-2c55674246b6f7600f86df516360f6e91fa11082.zip
kernel: update 3.10 to 3.10.2
Also refresh 3.10 patches. Signed-off-by: Gabor Juhos <juhosg@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37502 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm2708/patches-3.10/016-amba-pl011-fifosize.patch')
-rw-r--r--target/linux/brcm2708/patches-3.10/016-amba-pl011-fifosize.patch7
1 files changed, 3 insertions, 4 deletions
diff --git a/target/linux/brcm2708/patches-3.10/016-amba-pl011-fifosize.patch b/target/linux/brcm2708/patches-3.10/016-amba-pl011-fifosize.patch
index c994f912aa..4419612340 100644
--- a/target/linux/brcm2708/patches-3.10/016-amba-pl011-fifosize.patch
+++ b/target/linux/brcm2708/patches-3.10/016-amba-pl011-fifosize.patch
@@ -1,7 +1,6 @@
-diff -urN linux-3.10/drivers/tty/serial/amba-pl011.c linux-rpi-3.10.y/drivers/tty/serial/amba-pl011.c
---- linux-3.10/drivers/tty/serial/amba-pl011.c 2013-06-30 23:13:29.000000000 +0100
-+++ linux-rpi-3.10.y/drivers/tty/serial/amba-pl011.c 2013-07-06 15:25:50.000000000 +0100
-@@ -84,7 +84,7 @@
+--- a/drivers/tty/serial/amba-pl011.c
++++ b/drivers/tty/serial/amba-pl011.c
+@@ -84,7 +84,7 @@ struct vendor_data {
static unsigned int get_fifosize_arm(unsigned int periphid)
{