Merge branch 'acpica' into release

[mv-sheeva.git] / fs / logfs / logfs.h

diff --git a/fs/logfs/logfs.h b/fs/logfs/logfs.h
index 5e3b720779516d8ec6d8c74794c57c861a5436d5..b8786264d243fcd49d31f9d3fe670657264e46d4 100644 (file)
--- a/fs/logfs/logfs.h
+++ b/fs/logfs/logfs.h
@@ -504,8 +504,7 @@ extern const struct inode_operations logfs_reg_iops;
 extern const struct file_operations logfs_reg_fops;
 extern const struct address_space_operations logfs_reg_aops;
 int logfs_readpage(struct file *file, struct page *page);
-int logfs_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
-               unsigned long arg);
+long logfs_ioctl(struct file *file, unsigned int cmd, unsigned long arg);
 int logfs_fsync(struct file *file, int datasync);
 
 /* gc.c */