--- acerhk.c.orig	2010-10-22 23:33:34.195981177 +0200
+++ acerhk.c	2010-10-22 23:39:16.349277070 +0200
@@ -2793,8 +2793,7 @@ static void acerhk_proc_cleanup(void)
 
 /* {{{ file operations */
 
-static int acerhk_ioctl( struct inode *inode, struct file *file,
-                         unsigned int cmd, unsigned long arg )
+static long acerhk_unlocked_ioctl(struct file *file,unsigned int cmd, unsigned long arg )
 {
   int retval;
   switch( cmd ) {
@@ -2904,7 +2903,7 @@ static int acerhk_resume(struct platform
 
 static struct file_operations acerhk_fops = {
   owner:        THIS_MODULE,
-  ioctl:        acerhk_ioctl,
+  unlocked_ioctl:        acerhk_unlocked_ioctl,
   open:         acerhk_open,
 #ifdef ACERDEBUG
   write:        acerhk_write,