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
V4L/DVB (5918): ivtv: fix TV-out VBI handling, only reset on last close.
[pandora-kernel.git]
/
drivers
/
serial
/
netx-serial.c
diff --git
a/drivers/serial/netx-serial.c
b/drivers/serial/netx-serial.c
index
c1adc9e
..
b56f7db
100644
(file)
--- a/
drivers/serial/netx-serial.c
+++ b/
drivers/serial/netx-serial.c
@@
-17,8
+17,6
@@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <linux/config.h>
-
#if defined(CONFIG_SERIAL_NETX_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
#define SUPPORT_SYSRQ
#endif
#if defined(CONFIG_SERIAL_NETX_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
#define SUPPORT_SYSRQ
#endif
@@
-202,7
+200,7
@@
static void netx_txint(struct uart_port *port)
uart_write_wakeup(port);
}
uart_write_wakeup(port);
}
-static void netx_rxint(struct uart_port *port
, struct pt_regs *regs
)
+static void netx_rxint(struct uart_port *port)
{
unsigned char rx, flg, status;
struct tty_struct *tty = port->info->tty;
{
unsigned char rx, flg, status;
struct tty_struct *tty = port->info->tty;
@@
-237,7
+235,7
@@
static void netx_rxint(struct uart_port *port, struct pt_regs *regs)
flg = TTY_FRAME;
}
flg = TTY_FRAME;
}
- if (uart_handle_sysrq_char(port, rx
, regs
))
+ if (uart_handle_sysrq_char(port, rx))
continue;
uart_insert_char(port, status, SR_OE, rx, flg);
continue;
uart_insert_char(port, status, SR_OE, rx, flg);
@@
-247,9
+245,9
@@
static void netx_rxint(struct uart_port *port, struct pt_regs *regs)
return;
}
return;
}
-static irqreturn_t netx_int(int irq, void *dev_id
, struct pt_regs *regs
)
+static irqreturn_t netx_int(int irq, void *dev_id)
{
{
- struct uart_port *port =
(struct uart_port *)
dev_id;
+ struct uart_port *port = dev_id;
unsigned long flags;
unsigned char status;
unsigned long flags;
unsigned char status;
@@
-258,7
+256,7
@@
static irqreturn_t netx_int(int irq, void *dev_id, struct pt_regs *regs)
status = readl(port->membase + UART_IIR) & IIR_MASK;
while (status) {
if (status & IIR_RIS)
status = readl(port->membase + UART_IIR) & IIR_MASK;
while (status) {
if (status & IIR_RIS)
- netx_rxint(port
, regs
);
+ netx_rxint(port);
if (status & IIR_TIS)
netx_txint(port);
if (status & IIR_MIS) {
if (status & IIR_TIS)
netx_txint(port);
if (status & IIR_MIS) {
@@
-339,8
+337,8
@@
static void netx_shutdown(struct uart_port *port)
}
static void
}
static void
-netx_set_termios(struct uart_port *port, struct termios *termios,
- struct termios *old)
+netx_set_termios(struct uart_port *port, struct
k
termios *termios,
+ struct
k
termios *old)
{
unsigned int baud, quot;
unsigned char old_cr;
{
unsigned int baud, quot;
unsigned char old_cr;