Merge branch 'master' into for_paulus

[linux-drm-fsl-dcu.git] / drivers / media / video / se401.c

diff --git a/drivers/media/video/se401.c b/drivers/media/video/se401.c
index 67987baee77ae8e8c5767598d9c2ef32d248c6c5..038448f5a9781f3e5ea6463c00d411543fe9e2f4 100644 (file)
--- a/drivers/media/video/se401.c
+++ b/drivers/media/video/se401.c
@@ -282,7 +282,7 @@ static void se401_auto_resetlevel(struct usb_se401 *se401)
 }
 
 /* irq handler for snapshot button */
-static void se401_button_irq(struct urb *urb, struct pt_regs *regs)
+static void se401_button_irq(struct urb *urb)
 {
        struct usb_se401 *se401 = urb->context;
        int status;
@@ -318,7 +318,7 @@ exit:
                     __FUNCTION__, status);
 }
 
-static void se401_video_irq(struct urb *urb, struct pt_regs *regs)
+static void se401_video_irq(struct urb *urb)
 {
        struct usb_se401 *se401 = urb->context;
        int length = urb->actual_length;
@@ -1185,7 +1185,7 @@ static int se401_mmap(struct file *file, struct vm_area_struct *vma)
        return 0;
 }
 
-static struct file_operations se401_fops = {
+static const struct file_operations se401_fops = {
        .owner =        THIS_MODULE,
        .open =         se401_open,
        .release =      se401_close,