Merge branches 'gemini' and 'misc' into devel

[karo-tx-linux.git] / fs / smbfs / proto.h

diff --git a/fs/smbfs/proto.h b/fs/smbfs/proto.h
index 03f456c1b7d44cb6e5e7e9167fe9ece483ef2394..05939a6f43e625a28882d01b05a9e74135131de9 100644 (file)
--- a/fs/smbfs/proto.h
+++ b/fs/smbfs/proto.h
@@ -67,7 +67,7 @@ extern const struct address_space_operations smb_file_aops;
 extern const struct file_operations smb_file_operations;
 extern const struct inode_operations smb_file_inode_operations;
 /* ioctl.c */
-extern int smb_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg);
+extern long smb_ioctl(struct file *filp, unsigned int cmd, unsigned long arg);
 /* smbiod.c */
 extern void smbiod_wake_up(void);
 extern int smbiod_register_server(struct smb_sb_info *server);