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 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
[pandora-kernel.git]
/
drivers
/
char
/
amiserial.c
diff --git
a/drivers/char/amiserial.c
b/drivers/char/amiserial.c
index
486f97c
..
feb4ac8
100644
(file)
--- a/
drivers/char/amiserial.c
+++ b/
drivers/char/amiserial.c
@@
-104,7
+104,7
@@
static struct async_struct *IRQ_ports;
static unsigned char current_ctl_bits;
static unsigned char current_ctl_bits;
-static void change_speed(struct async_struct *info, struct termios *old);
+static void change_speed(struct async_struct *info, struct
k
termios *old);
static void rs_wait_until_sent(struct tty_struct *tty, int timeout);
static void rs_wait_until_sent(struct tty_struct *tty, int timeout);
@@
-447,7
+447,7
@@
static void check_modem_status(struct async_struct *info)
}
}
}
}
-static irqreturn_t ser_vbl_int( int irq, void *data
, struct pt_regs *regs
)
+static irqreturn_t ser_vbl_int( int irq, void *data)
{
/* vbl is just a periodic interrupt we tie into to update modem status */
struct async_struct * info = IRQ_ports;
{
/* vbl is just a periodic interrupt we tie into to update modem status */
struct async_struct * info = IRQ_ports;
@@
-460,7
+460,7
@@
static irqreturn_t ser_vbl_int( int irq, void *data, struct pt_regs *regs)
return IRQ_HANDLED;
}
return IRQ_HANDLED;
}
-static irqreturn_t ser_rx_int(int irq, void *dev_id
, struct pt_regs * regs
)
+static irqreturn_t ser_rx_int(int irq, void *dev_id)
{
struct async_struct * info;
{
struct async_struct * info;
@@
-480,7
+480,7
@@
static irqreturn_t ser_rx_int(int irq, void *dev_id, struct pt_regs * regs)
return IRQ_HANDLED;
}
return IRQ_HANDLED;
}
-static irqreturn_t ser_tx_int(int irq, void *dev_id
, struct pt_regs * regs
)
+static irqreturn_t ser_tx_int(int irq, void *dev_id)
{
struct async_struct * info;
{
struct async_struct * info;
@@
-694,7
+694,7
@@
static void shutdown(struct async_struct * info)
* the specified baud rate for a serial port.
*/
static void change_speed(struct async_struct *info,
* the specified baud rate for a serial port.
*/
static void change_speed(struct async_struct *info,
- struct termios *old_termios)
+ struct
k
termios *old_termios)
{
int quot = 0, baud_base, baud;
unsigned cflag, cval = 0;
{
int quot = 0, baud_base, baud;
unsigned cflag, cval = 0;
@@
-1365,7
+1365,7
@@
static int rs_ioctl(struct tty_struct *tty, struct file * file,
return 0;
}
return 0;
}
-static void rs_set_termios(struct tty_struct *tty, struct termios *old_termios)
+static void rs_set_termios(struct tty_struct *tty, struct
k
termios *old_termios)
{
struct async_struct *info = (struct async_struct *)tty->driver_data;
unsigned long flags;
{
struct async_struct *info = (struct async_struct *)tty->driver_data;
unsigned long flags;