diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-05 11:47:22 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-05 11:47:22 +1000 |
| commit | ec662e4c092c6761dfbe9f65cadb4aa4a097442d (patch) | |
| tree | 49f19f39fa0d15462fce1cc3017059c15d0dd23e /fs/smbfs/proto.h | |
| parent | 3acff4d13646874c7c561fd6749824e5fbd0b708 (diff) | |
| parent | a9e04bf946ca338356834ef57bc0f54650b54ab9 (diff) | |
Merge remote branch 'bkl-ioctl/bkl/ioctl'
Conflicts:
arch/cris/arch-v10/drivers/ds1302.c
drivers/block/pktcdvd.c
Diffstat (limited to 'fs/smbfs/proto.h')
| -rw-r--r-- | fs/smbfs/proto.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/smbfs/proto.h b/fs/smbfs/proto.h index 03f456c1b7d4..05939a6f43e6 100644 --- 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); |