git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
[pandora-kernel.git]
/
drivers
/
serial
/
bfin_5xx.c
diff --git
a/drivers/serial/bfin_5xx.c
b/drivers/serial/bfin_5xx.c
index
fd9bb77
..
9d85437
100644
(file)
--- a/
drivers/serial/bfin_5xx.c
+++ b/
drivers/serial/bfin_5xx.c
@@
-175,7
+175,7
@@
int kgdb_get_debug_char(void)
#ifdef CONFIG_SERIAL_BFIN_PIO
static void bfin_serial_rx_chars(struct bfin_serial_port *uart)
{
#ifdef CONFIG_SERIAL_BFIN_PIO
static void bfin_serial_rx_chars(struct bfin_serial_port *uart)
{
- struct tty_struct *tty = uart->port.info->tty;
+ struct tty_struct *tty = uart->port.info->
port.
tty;
unsigned int status, ch, flg;
static struct timeval anomaly_start = { .tv_sec = 0 };
unsigned int status, ch, flg;
static struct timeval anomaly_start = { .tv_sec = 0 };
@@
-393,7
+393,7
@@
static void bfin_serial_dma_tx_chars(struct bfin_serial_port *uart)
static void bfin_serial_dma_rx_chars(struct bfin_serial_port *uart)
{
static void bfin_serial_dma_rx_chars(struct bfin_serial_port *uart)
{
- struct tty_struct *tty = uart->port.info->tty;
+ struct tty_struct *tty = uart->port.info->
port.
tty;
int i, flg, status;
status = UART_GET_LSR(uart);
int i, flg, status;
status = UART_GET_LSR(uart);
@@
-552,7
+552,7
@@
static void bfin_serial_mctrl_check(struct bfin_serial_port *uart)
#ifdef CONFIG_SERIAL_BFIN_CTSRTS
unsigned int status;
struct uart_info *info = uart->port.info;
#ifdef CONFIG_SERIAL_BFIN_CTSRTS
unsigned int status;
struct uart_info *info = uart->port.info;
- struct tty_struct *tty = info->tty;
+ struct tty_struct *tty = info->
port.
tty;
status = bfin_serial_get_mctrl(&uart->port);
uart_handle_cts_change(&uart->port, status & TIOCM_CTS);
status = bfin_serial_get_mctrl(&uart->port);
uart_handle_cts_change(&uart->port, status & TIOCM_CTS);
@@
-814,10
+814,10
@@
static void bfin_serial_set_ldisc(struct uart_port *port)
int line = port->line;
unsigned short val;
int line = port->line;
unsigned short val;
- if (line >= port->info->tty->driver->num)
+ if (line >= port->info->
port.
tty->driver->num)
return;
return;
- switch (port->info->tty->ldisc.num) {
+ switch (port->info->
port.
tty->ldisc.num) {
case N_IRDA:
val = UART_GET_GCTL(&bfin_serial_ports[line]);
val |= (IREN | RPOLC);
case N_IRDA:
val = UART_GET_GCTL(&bfin_serial_ports[line]);
val |= (IREN | RPOLC);