aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/s3c24xx/patches-2.6.30/110-serial.patch
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2009-07-05 09:47:42 +0000
committerLars-Peter Clausen <lars@metafoo.de>2009-07-05 09:47:42 +0000
commitcaf8c9f59e60d64d5543bcfd8bb316eac85c54cf (patch)
tree6adf51e51fef336d56508723cfd9714de25101eb /target/linux/s3c24xx/patches-2.6.30/110-serial.patch
parent85afb807c53b3776d9457958abd6607502b83cd3 (diff)
downloadupstream-caf8c9f59e60d64d5543bcfd8bb316eac85c54cf.tar.gz
upstream-caf8c9f59e60d64d5543bcfd8bb316eac85c54cf.tar.bz2
upstream-caf8c9f59e60d64d5543bcfd8bb316eac85c54cf.zip
Update to 2.6.30.1, refresh patches
SVN-Revision: 16680
Diffstat (limited to 'target/linux/s3c24xx/patches-2.6.30/110-serial.patch')
-rw-r--r--target/linux/s3c24xx/patches-2.6.30/110-serial.patch10
1 files changed, 4 insertions, 6 deletions
diff --git a/target/linux/s3c24xx/patches-2.6.30/110-serial.patch b/target/linux/s3c24xx/patches-2.6.30/110-serial.patch
index edb3aa5ac5..e01394b6ff 100644
--- a/target/linux/s3c24xx/patches-2.6.30/110-serial.patch
+++ b/target/linux/s3c24xx/patches-2.6.30/110-serial.patch
@@ -1,7 +1,6 @@
-diff -urNX /opt/Projects/openmoko-linux-2.6/orig/dontdiff /opt/Projects/openmoko-linux-2.6/orig/linux-2.6.29-rc3/drivers/serial/samsung.c /opt/Projects/openmoko-linux-2.6/drivers/serial/samsung.c
---- a/drivers/serial/samsung.c 2009-01-28 19:49:30.000000000 +0100
-+++ b/drivers/serial/samsung.c 2009-05-16 13:25:47.000000000 +0200
-@@ -1208,6 +1355,13 @@
+--- a/drivers/serial/samsung.c
++++ b/drivers/serial/samsung.c
+@@ -1263,6 +1263,13 @@ module_exit(s3c24xx_serial_modexit);
#ifdef CONFIG_SERIAL_SAMSUNG_CONSOLE
static struct uart_port *cons_uart;
@@ -15,7 +14,7 @@ diff -urNX /opt/Projects/openmoko-linux-2.6/orig/dontdiff /opt/Projects/openmoko
static int
s3c24xx_serial_console_txrdy(struct uart_port *port, unsigned int ufcon)
-@@ -1232,9 +1386,21 @@
+@@ -1287,9 +1294,21 @@ static void
s3c24xx_serial_console_putchar(struct uart_port *port, int ch)
{
unsigned int ufcon = rd_regl(cons_uart, S3C2410_UFCON);
@@ -37,4 +36,3 @@ diff -urNX /opt/Projects/openmoko-linux-2.6/orig/dontdiff /opt/Projects/openmoko
}
static void
-