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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
serial
/
ioc3_serial.c
diff --git
a/drivers/serial/ioc3_serial.c
b/drivers/serial/ioc3_serial.c
index
8097cd9
..
9cc0be9
100644
(file)
--- a/
drivers/serial/ioc3_serial.c
+++ b/
drivers/serial/ioc3_serial.c
@@
-950,7
+950,7
@@
static void transmit_chars(struct uart_port *the_port)
*/
static void
ioc3_change_speed(struct uart_port *the_port,
*/
static void
ioc3_change_speed(struct uart_port *the_port,
- struct
termios *new_termios, struct
termios *old_termios)
+ struct
ktermios *new_termios, struct k
termios *old_termios)
{
struct ioc3_port *port = get_ioc3_port(the_port);
unsigned int cflag;
{
struct ioc3_port *port = get_ioc3_port(the_port);
unsigned int cflag;
@@
-1428,13
+1428,12
@@
static int receive_chars(struct uart_port *the_port)
* @is : submodule
* @idd: driver data
* @pending: interrupts to handle
* @is : submodule
* @idd: driver data
* @pending: interrupts to handle
- * @regs: pt_regs
*/
static int inline
ioc3uart_intr_one(struct ioc3_submodule *is,
struct ioc3_driver_data *idd,
*/
static int inline
ioc3uart_intr_one(struct ioc3_submodule *is,
struct ioc3_driver_data *idd,
- unsigned int pending
, struct pt_regs *regs
)
+ unsigned int pending)
{
int port_num = GET_PORT_FROM_SIO_IR(pending);
struct port_hooks *hooks;
{
int port_num = GET_PORT_FROM_SIO_IR(pending);
struct port_hooks *hooks;
@@
-1628,13
+1627,12
@@
ioc3uart_intr_one(struct ioc3_submodule *is,
* @is : submodule
* @idd: driver data
* @pending: interrupts to handle
* @is : submodule
* @idd: driver data
* @pending: interrupts to handle
- * @regs: pt_regs
*
*/
static int ioc3uart_intr(struct ioc3_submodule *is,
struct ioc3_driver_data *idd,
*
*/
static int ioc3uart_intr(struct ioc3_submodule *is,
struct ioc3_driver_data *idd,
- unsigned int pending
, struct pt_regs *regs
)
+ unsigned int pending)
{
int ret = 0;
{
int ret = 0;
@@
-1644,9
+1642,9
@@
static int ioc3uart_intr(struct ioc3_submodule *is,
*/
if (pending & SIO_IR_SA)
*/
if (pending & SIO_IR_SA)
- ret |= ioc3uart_intr_one(is, idd, pending & SIO_IR_SA
, regs
);
+ ret |= ioc3uart_intr_one(is, idd, pending & SIO_IR_SA);
if (pending & SIO_IR_SB)
if (pending & SIO_IR_SB)
- ret |= ioc3uart_intr_one(is, idd, pending & SIO_IR_SB
, regs
);
+ ret |= ioc3uart_intr_one(is, idd, pending & SIO_IR_SB);
return ret;
}
return ret;
}
@@
-1855,7
+1853,7
@@
static int ic3_startup(struct uart_port *the_port)
*/
static void
ic3_set_termios(struct uart_port *the_port,
*/
static void
ic3_set_termios(struct uart_port *the_port,
- struct
termios *termios, struct
termios *old_termios)
+ struct
ktermios *termios, struct k
termios *old_termios)
{
unsigned long port_flags;
{
unsigned long port_flags;