aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/etrax/patches-2.6.29/600-fix_serial_cris.patch
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2009-05-04 11:35:08 +0000
committerImre Kaloz <kaloz@openwrt.org>2009-05-04 11:35:08 +0000
commit13f29a0f22806c6d01e3a9a5dcfdf31d63106e6b (patch)
tree9f6af4c9e1673c9e1c1f0d2e358b21f029573bf4 /target/linux/etrax/patches-2.6.29/600-fix_serial_cris.patch
parent7569c0abe98e35c6cfbaf65c3962024b4cd0fdf8 (diff)
downloadmaster-187ad058-13f29a0f22806c6d01e3a9a5dcfdf31d63106e6b.tar.gz
master-187ad058-13f29a0f22806c6d01e3a9a5dcfdf31d63106e6b.tar.bz2
master-187ad058-13f29a0f22806c6d01e3a9a5dcfdf31d63106e6b.zip
refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15581 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/etrax/patches-2.6.29/600-fix_serial_cris.patch')
-rw-r--r--target/linux/etrax/patches-2.6.29/600-fix_serial_cris.patch14
1 files changed, 6 insertions, 8 deletions
diff --git a/target/linux/etrax/patches-2.6.29/600-fix_serial_cris.patch b/target/linux/etrax/patches-2.6.29/600-fix_serial_cris.patch
index 7ac24a474b..4032550661 100644
--- a/target/linux/etrax/patches-2.6.29/600-fix_serial_cris.patch
+++ b/target/linux/etrax/patches-2.6.29/600-fix_serial_cris.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.28.9/drivers/serial/crisv10.c
-===================================================================
---- linux-2.6.28.9.orig/drivers/serial/crisv10.c 2009-04-10 12:58:18.000000000 +0200
-+++ linux-2.6.28.9/drivers/serial/crisv10.c 2009-04-10 12:58:22.000000000 +0200
-@@ -28,12 +28,15 @@
+--- a/drivers/serial/crisv10.c
++++ b/drivers/serial/crisv10.c
+@@ -28,12 +28,15 @@ static char *serial_version = "$Revision
#include <linux/mutex.h>
#include <linux/bitops.h>
#include <linux/device.h>
@@ -20,7 +18,7 @@ Index: linux-2.6.28.9/drivers/serial/crisv10.c
#include <arch/svinto.h>
-@@ -457,7 +460,6 @@
+@@ -457,7 +460,6 @@ static struct e100_serial rs_table[] = {
#define NR_PORTS (sizeof(rs_table)/sizeof(struct e100_serial))
@@ -28,7 +26,7 @@ Index: linux-2.6.28.9/drivers/serial/crisv10.c
#ifdef CONFIG_ETRAX_SERIAL_FAST_TIMER
static struct fast_timer fast_timers[NR_PORTS];
#endif
-@@ -4221,151 +4223,132 @@
+@@ -4221,151 +4223,132 @@ rs_open(struct tty_struct *tty, struct f
return 0;
}
@@ -249,7 +247,7 @@ Index: linux-2.6.28.9/drivers/serial/crisv10.c
&serial_version[11]); /* "$Revision: x.yy" */
}
-@@ -4389,9 +4372,11 @@
+@@ -4389,9 +4372,11 @@ static const struct tty_operations rs_op
.break_ctl = rs_break,
.send_xchar = rs_send_xchar,
.wait_until_sent = rs_wait_until_sent,