--- acerhk.c.orig	2010-11-30 14:39:06.000000000 +0100
+++ acerhk.c		2010-11-30 17:06:16.000000000 +0100
@@ -2750,10 +2751,9 @@
 
 /* {{{ file operations */
 
-static int acerhk_ioctl( struct inode *inode, struct file *file,
-                         unsigned int cmd, unsigned long arg )
+static long acerhk_ioctl(struct file *file, unsigned int cmd, unsigned long arg )
 {
-  int retval;
+  long retval;
   switch( cmd ) {
   case ACERHK_GET_KEYCOUNT:
     {
@@ -2847,7 +2847,7 @@
 
 static struct file_operations acerhk_fops = {
   owner:        THIS_MODULE,
-  ioctl:        acerhk_ioctl,
+  unlocked_ioctl:        acerhk_ioctl,
   open:         acerhk_open,
 #ifdef ACERDEBUG
   write:        acerhk_write,