git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'acpica' into release
[pandora-kernel.git]
/
fs
/
reiserfs
/
file.c
diff --git
a/fs/reiserfs/file.c
b/fs/reiserfs/file.c
index
9f43666
..
da2dba0
100644
(file)
--- a/
fs/reiserfs/file.c
+++ b/
fs/reiserfs/file.c
@@
-284,7
+284,7
@@
static ssize_t reiserfs_file_write(struct file *file, /* the file we are going t
const struct file_operations reiserfs_file_operations = {
.read = do_sync_read,
.write = reiserfs_file_write,
- .ioctl = reiserfs_ioctl,
+ .
unlocked_
ioctl = reiserfs_ioctl,
#ifdef CONFIG_COMPAT
.compat_ioctl = reiserfs_compat_ioctl,
#endif