Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm

[cascardo/linux.git] / fs / ioctl.c

diff --git a/fs/ioctl.c b/fs/ioctl.c
index 5d01d26..41c352e 100644 (file)
--- a/fs/ioctl.c
+++ b/fs/ioctl.c
@@ -15,6 +15,7 @@
 #include <linux/writeback.h>
 #include <linux/buffer_head.h>
 #include <linux/falloc.h>
+#include "internal.h"
 
 #include <asm/ioctls.h>
 
@@ -32,8 +33,7 @@
  *
  * Returns 0 on success, -errno on error.
  */
-static long vfs_ioctl(struct file *filp, unsigned int cmd,
-                     unsigned long arg)
+long vfs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
 {
        int error = -ENOTTY;