]>
Commit | Line | Data |
---|---|---|
0dc0267f TP |
1 | diff -upN acerhk.old//acerhk.c acerhk//acerhk.c |
2 | --- acerhk.old//acerhk.c 2011-01-30 01:08:21.276542993 +0200 | |
3 | +++ acerhk//acerhk.c 2011-01-30 01:11:57.692542994 +0200 | |
4 | @@ -2827,10 +2827,10 @@ static void acerhk_proc_cleanup(void) | |
5 | ||
6 | /* {{{ file operations */ | |
7 | ||
8 | -static int acerhk_ioctl( struct inode *inode, struct file *file, | |
9 | +static long acerhk_ioctl( struct file *file, | |
10 | unsigned int cmd, unsigned long arg ) | |
11 | { | |
12 | - int retval; | |
13 | + long retval; | |
14 | switch( cmd ) { | |
15 | case ACERHK_GET_KEYCOUNT: | |
16 | { | |
17 | @@ -2938,7 +2938,7 @@ static int acerhk_resume(struct platform | |
18 | ||
19 | static struct file_operations acerhk_fops = { | |
20 | owner: THIS_MODULE, | |
21 | - ioctl: acerhk_ioctl, | |
22 | + unlocked_ioctl: acerhk_ioctl, | |
23 | open: acerhk_open, | |
24 | #ifdef ACERDEBUG | |
25 | write: acerhk_write, | |
26 | Common subdirectories: acerhk.old//debian and acerhk//debian | |
27 | Common subdirectories: acerhk.old//doc and acerhk//doc | |
28 | Common subdirectories: acerhk.old//.tmp_versions and acerhk//.tmp_versions |