Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6

[mv-sheeva.git] / drivers / char / esp.c

diff --git a/drivers/char/esp.c b/drivers/char/esp.c
index afcd83d9984be5b00937c7959d3bc7476ec2041c..15a4ea896328cc23ad6be070357b76baf41c59bd 100644 (file)
--- a/drivers/char/esp.c
+++ b/drivers/char/esp.c
@@ -615,8 +615,7 @@ static inline void check_modem_status(struct esp_struct *info)
 /*
  * This is the serial driver's interrupt routine
  */
-static irqreturn_t rs_interrupt_single(int irq, void *dev_id,
-                                       struct pt_regs *regs)
+static irqreturn_t rs_interrupt_single(int irq, void *dev_id)
 {
        struct esp_struct * info;
        unsigned err_status;
@@ -2376,7 +2375,7 @@ static inline int autoconfig(struct esp_struct * info)
        return (port_detected);
 }
 
-static struct tty_operations esp_ops = {
+static const struct tty_operations esp_ops = {
        .open = esp_open,
        .close = rs_close,
        .write = rs_write,