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 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6
[pandora-kernel.git]
/
fs
/
jffs2
/
file.c
diff --git
a/fs/jffs2/file.c
b/fs/jffs2/file.c
index
5e92034
..
5a98aa8
100644
(file)
--- a/
fs/jffs2/file.c
+++ b/
fs/jffs2/file.c
@@
-46,7
+46,7
@@
const struct file_operations jffs2_file_operations =
.aio_read = generic_file_aio_read,
.write = do_sync_write,
.aio_write = generic_file_aio_write,
- .
ioctl =
jffs2_ioctl,
+ .
unlocked_ioctl=
jffs2_ioctl,
.mmap = generic_file_readonly_mmap,
.fsync = jffs2_fsync,
.splice_read = generic_file_splice_read,