Merge branch 'for-linus' of git://neil.brown.name/md

[~andy/linux] / drivers / s390 / char / keyboard.c

diff --git a/drivers/s390/char/keyboard.c b/drivers/s390/char/keyboard.c
index 5ad44daef73bdf5ea54eac6e5885c068042d7dd1..806588192483798437796bccd817e1e3f2192386 100644 (file)
--- a/drivers/s390/char/keyboard.c
+++ b/drivers/s390/char/keyboard.c
@@ -455,9 +455,7 @@ do_kdgkb_ioctl(struct kbd_data *kbd, struct kbsentry __user *u_kbs,
        return 0;
 }
 
-int
-kbd_ioctl(struct kbd_data *kbd, struct file *file,
-         unsigned int cmd, unsigned long arg)
+int kbd_ioctl(struct kbd_data *kbd, unsigned int cmd, unsigned long arg)
 {
        void __user *argp;
        unsigned int ct;