Merge branch 'devel' into next

[pandora-kernel.git] / fs / ioctl.c

diff --git a/fs/ioctl.c b/fs/ioctl.c
index 683002f..7db32b3 100644 (file)
--- a/fs/ioctl.c
+++ b/fs/ioctl.c
@@ -18,18 +18,18 @@
 
 /**
  * vfs_ioctl - call filesystem specific ioctl methods
- * @filp: [in]     open file to invoke ioctl method on
- * @cmd:  [in]     ioctl command to execute
- * @arg:  [in/out] command-specific argument for ioctl
+ * @filp:      open file to invoke ioctl method on
+ * @cmd:       ioctl command to execute
+ * @arg:       command-specific argument for ioctl
  *
  * Invokes filesystem specific ->unlocked_ioctl, if one exists; otherwise
- * invokes * filesystem specific ->ioctl method.  If neither method exists,
+ * invokes filesystem specific ->ioctl method.  If neither method exists,
  * returns -ENOTTY.
  *
  * Returns 0 on success, -errno on error.
  */
-long vfs_ioctl(struct file *filp, unsigned int cmd,
-              unsigned long arg)
+static long vfs_ioctl(struct file *filp, unsigned int cmd,
+                     unsigned long arg)
 {
        int error = -ENOTTY;