Merge git://git.infradead.org/~dwmw2/cafe-2.6

[firefly-linux-kernel-4.4.55.git] / drivers / char / vr41xx_giu.c

diff --git a/drivers/char/vr41xx_giu.c b/drivers/char/vr41xx_giu.c
index 073da48c092e0ae804cc6354b9c897c668b6033c..8e794930517111ec3013f79f0f486c1ad7998265 100644 (file)
--- a/drivers/char/vr41xx_giu.c
+++ b/drivers/char/vr41xx_giu.c
@@ -33,6 +33,7 @@
 #include <asm/cpu.h>
 #include <asm/io.h>
 #include <asm/vr41xx/giu.h>
+#include <asm/vr41xx/irq.h>
 #include <asm/vr41xx/vr41xx.h>
 
 MODULE_AUTHOR("Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>");
@@ -220,7 +221,7 @@ static struct hw_interrupt_type giuint_high_irq_type = {
        .end            = end_giuint_high_irq,
 };
 
-static int giu_get_irq(unsigned int irq, struct pt_regs *regs)
+static int giu_get_irq(unsigned int irq)
 {
        uint16_t pendl, pendh, maskl, maskh;
        int i;
@@ -605,7 +606,7 @@ static int gpio_release(struct inode *inode, struct file *file)
        return 0;
 }
 
-static struct file_operations gpio_fops = {
+static const struct file_operations gpio_fops = {
        .owner          = THIS_MODULE,
        .read           = gpio_read,
        .write          = gpio_write,