git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
drivers
/
serial
/
s3c2410.c
diff --git
a/drivers/serial/s3c2410.c
b/drivers/serial/s3c2410.c
index
22a02bd
..
70d2f83
100644
(file)
--- a/
drivers/serial/s3c2410.c
+++ b/
drivers/serial/s3c2410.c
@@
-26,8
+26,6
@@
#include <asm/hardware.h>
#include <asm/arch/regs-serial.h>
#include <asm/hardware.h>
#include <asm/arch/regs-serial.h>
-#include <asm/mach-types.h>
-
#if 0
#include <asm/debug-ll.h>
#define dbg(x...) llprintk(x)
#if 0
#include <asm/debug-ll.h>
#define dbg(x...) llprintk(x)
@@
-677,7
+675,7
@@
serial_s3c2410_get_options(struct uart_port *port, int *baud,
default:
case S3C2410_LCON_PNONE:
default:
case S3C2410_LCON_PNONE:
- /* nothing */
+ *parity = 'n';
}
/* now calculate the baud rate */
}
/* now calculate the baud rate */