diff options
| author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2011-02-25 14:28:30 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-25 09:56:13 -0800 |
| commit | 65c56e073e4fd10385283561b91189572e33b519 (patch) | |
| tree | dd3d0f43ace70603d7b3161a7288451763185597 /drivers/s390/char/keyboard.c | |
| parent | 310388beea4d00bb1c56e81ded82bdc25bdcf719 (diff) | |
| download | kernel_samsung_smdk4412-65c56e073e4fd10385283561b91189572e33b519.zip kernel_samsung_smdk4412-65c56e073e4fd10385283561b91189572e33b519.tar.gz kernel_samsung_smdk4412-65c56e073e4fd10385283561b91189572e33b519.tar.bz2 | |
tty: phase out of ioctl file pointer for tty3270 as well
The patch "tty: now phase out the ioctl file pointer for good" missed
the tty3270 driver. This is the missing piece.
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/s390/char/keyboard.c')
| -rw-r--r-- | drivers/s390/char/keyboard.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/s390/char/keyboard.c b/drivers/s390/char/keyboard.c index 8cd58e4..d667334 100644 --- 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; int ct, perm; |