projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy...
[powerpc.git]
/
drivers
/
serial
/
clps711x.c
diff --git
a/drivers/serial/clps711x.c
b/drivers/serial/clps711x.c
index
2691112
..
2382718
100644
(file)
--- a/
drivers/serial/clps711x.c
+++ b/
drivers/serial/clps711x.c
@@
-25,7
+25,6
@@
* $Id: clps711x.c,v 1.42 2002/07/28 10:03:28 rmk Exp $
*
*/
* $Id: clps711x.c,v 1.42 2002/07/28 10:03:28 rmk Exp $
*
*/
-#include <linux/config.h>
#if defined(CONFIG_SERIAL_CLPS711X_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
#define SUPPORT_SYSRQ
#if defined(CONFIG_SERIAL_CLPS711X_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
#define SUPPORT_SYSRQ
@@
-94,7
+93,7
@@
static void clps711xuart_enable_ms(struct uart_port *port)
{
}
{
}
-static irqreturn_t clps711xuart_int_rx(int irq, void *dev_id
, struct pt_regs *regs
)
+static irqreturn_t clps711xuart_int_rx(int irq, void *dev_id)
{
struct uart_port *port = dev_id;
struct tty_struct *tty = port->info->tty;
{
struct uart_port *port = dev_id;
struct tty_struct *tty = port->info->tty;
@@
-132,7
+131,7
@@
static irqreturn_t clps711xuart_int_rx(int irq, void *dev_id, struct pt_regs *re
#endif
}
#endif
}
- if (uart_handle_sysrq_char(port, ch
, regs
))
+ if (uart_handle_sysrq_char(port, ch))
goto ignore_char;
/*
goto ignore_char;
/*
@@
-148,7
+147,7
@@
static irqreturn_t clps711xuart_int_rx(int irq, void *dev_id, struct pt_regs *re
return IRQ_HANDLED;
}
return IRQ_HANDLED;
}
-static irqreturn_t clps711xuart_int_tx(int irq, void *dev_id
, struct pt_regs *regs
)
+static irqreturn_t clps711xuart_int_tx(int irq, void *dev_id)
{
struct uart_port *port = dev_id;
struct circ_buf *xmit = &port->info->xmit;
{
struct uart_port *port = dev_id;
struct circ_buf *xmit = &port->info->xmit;
@@
-287,8
+286,8
@@
static void clps711xuart_shutdown(struct uart_port *port)
}
static void
}
static void
-clps711xuart_set_termios(struct uart_port *port, struct termios *termios,
- struct termios *old)
+clps711xuart_set_termios(struct uart_port *port, struct
k
termios *termios,
+ struct
k
termios *old)
{
unsigned int ubrlcr, baud, quot;
unsigned long flags;
{
unsigned int ubrlcr, baud, quot;
unsigned long flags;