diff options
| author | Andres Salomon <dilinger@debian.org> | 2008-05-12 13:44:03 -0400 |
|---|---|---|
| committer | Andres Salomon <dilinger@debian.org> | 2008-05-12 13:44:03 -0400 |
| commit | a1fcb5b7b424e9fb57c2b8448f70ee20a961ad4b (patch) | |
| tree | 72b5e1fe27a5b65f42c25d0eb8aff3d067f9b0ff /include/linux | |
| parent | 369d9dd17683faa8be41be581db141e80eae05ce (diff) | |
| parent | d8447b287c252e02f135618ed4a8781fd3b8797f (diff) | |
| download | lwn-a1fcb5b7b424e9fb57c2b8448f70ee20a961ad4b.tar.gz lwn-a1fcb5b7b424e9fb57c2b8448f70ee20a961ad4b.zip | |
Merge branch '2.6.25.y' into testing
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/reiserfs_fs.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/reiserfs_fs.h b/include/linux/reiserfs_fs.h index 8e7eff2cd0ab..4aacaeecb56f 100644 --- a/include/linux/reiserfs_fs.h +++ b/include/linux/reiserfs_fs.h @@ -2176,6 +2176,7 @@ int reiserfs_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg); long reiserfs_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg); +int reiserfs_unpack(struct inode *inode, struct file *filp); /* ioctl's command */ #define REISERFS_IOC_UNPACK _IOW(0xCD,1,long) |