Merge branch 'akpm' (patches from Andrew)

[linux-2.6-microblaze.git] / include / linux / fs.h

diff --git a/include/linux/fs.h b/include/linux/fs.h
index eeed80f..c159a8b 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1727,6 +1727,13 @@ int vfs_mkobj(struct dentry *, umode_t,
 
 extern long vfs_ioctl(struct file *file, unsigned int cmd, unsigned long arg);
 
+#ifdef CONFIG_COMPAT
+extern long compat_ptr_ioctl(struct file *file, unsigned int cmd,
+                                       unsigned long arg);
+#else
+#define compat_ptr_ioctl NULL
+#endif
+
 /*
  * VFS file helper functions.
  */