--- amrmo_init.c.orig 2011-01-06 20:12:59.000000000 +0100 +++ amrmo_init.c 2011-01-06 20:12:34.000000000 +0100 @@ -437,11 +437,11 @@ static unsigned int amrmo_poll(struct fi -static int amrmo_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long parg) +static long amrmo_unlocked_ioctl(struct file *file, unsigned int cmd, unsigned long parg) { struct amrmo_struct *amrmo = (struct amrmo_struct *)file->private_data; unsigned long flags; - int ret; + long ret; unsigned stat; unsigned long arg=0; @@ -514,7 +514,7 @@ static struct file_operations amrmo_fops .read = amrmo_read, .write = amrmo_write, .poll = amrmo_poll, - .ioctl = amrmo_ioctl, + .unlocked_ioctl = amrmo_unlocked_ioctl, .open = amrmo_open, .release = amrmo_release, };