diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
| commit | a815752ac0ffdb910e92958d41d28f4fb28e5296 (patch) | |
| tree | a3aa16a282354da0debe8e3a3a7ed8aac6e54001 /fs/ioctl.c | |
| parent | 5ade9deaaa3e1f7291467d97b238648e43eae15e (diff) | |
| parent | a15306365a16380f3bafee9e181ba01231d4acd7 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/ioctl.c')
| -rw-r--r-- | fs/ioctl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ioctl.c b/fs/ioctl.c index f32fbde2175e..7db32b3382d3 100644 --- a/fs/ioctl.c +++ b/fs/ioctl.c | |||
| @@ -28,8 +28,8 @@ | |||
| 28 | * | 28 | * |
| 29 | * Returns 0 on success, -errno on error. | 29 | * Returns 0 on success, -errno on error. |
| 30 | */ | 30 | */ |
| 31 | long vfs_ioctl(struct file *filp, unsigned int cmd, | 31 | static long vfs_ioctl(struct file *filp, unsigned int cmd, |
| 32 | unsigned long arg) | 32 | unsigned long arg) |
| 33 | { | 33 | { |
| 34 | int error = -ENOTTY; | 34 | int error = -ENOTTY; |
| 35 | 35 | ||