Merge branch 'master' into upstream-fixes

[sfrench/cifs-2.6.git] / drivers / char / ppdev.c

diff --git a/drivers/char/ppdev.c b/drivers/char/ppdev.c
index 24231d9743dc297a7db77bbb0796e190163591ca..efc485edad1c26ebbb1d3a43a95c9b54f881d617 100644 (file)
--- a/drivers/char/ppdev.c
+++ b/drivers/char/ppdev.c
@@ -269,7 +269,7 @@ static ssize_t pp_write (struct file * file, const char __user * buf,
        return bytes_written;
 }
 
-static void pp_irq (int irq, void * private, struct pt_regs * unused)
+static void pp_irq (int irq, void * private)
 {
        struct pp_struct * pp = (struct pp_struct *) private;
 
@@ -739,7 +739,7 @@ static unsigned int pp_poll (struct file * file, poll_table * wait)
 
 static struct class *ppdev_class;
 
-static struct file_operations pp_fops = {
+static const struct file_operations pp_fops = {
        .owner          = THIS_MODULE,
        .llseek         = no_llseek,
        .read           = pp_read,