aboutsummaryrefslogtreecommitdiffstats
path: root/fs/xfs/linux-2.6/xfs_ioctl32.h
diff options
context:
space:
mode:
authorAnton Altaparmakov <aia21@cantab.net>2005-05-30 16:34:37 -0400
committerAnton Altaparmakov <aia21@cantab.net>2005-05-30 16:34:37 -0400
commit4ff4258a3e558814a3d48c50a59cd22f56bbea2f (patch)
tree35ac4a5d2b162687eef0c38aecf14f3a7c5afee0 /fs/xfs/linux-2.6/xfs_ioctl32.h
parent442d207eb0b4e7047c4fedccd900c425e689d502 (diff)
parent5e485b7975472ba4a408523deb6541e70c451842 (diff)
Automatic merge with /usr/src/ntfs-2.6.git.
Diffstat (limited to 'fs/xfs/linux-2.6/xfs_ioctl32.h')
-rw-r--r--fs/xfs/linux-2.6/xfs_ioctl32.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/xfs/linux-2.6/xfs_ioctl32.h b/fs/xfs/linux-2.6/xfs_ioctl32.h
index 779f69a48116..c874793a1dc9 100644
--- a/fs/xfs/linux-2.6/xfs_ioctl32.h
+++ b/fs/xfs/linux-2.6/xfs_ioctl32.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (c) 2004 Silicon Graphics, Inc. All Rights Reserved. 2 * Copyright (c) 2004-2005 Silicon Graphics, Inc. All Rights Reserved.
3 * 3 *
4 * This program is free software; you can redistribute it and/or modify it 4 * This program is free software; you can redistribute it and/or modify it
5 * under the terms of version 2 of the GNU General Public License as 5 * under the terms of version 2 of the GNU General Public License as
@@ -30,5 +30,5 @@
30 * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ 30 * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
31 */ 31 */
32 32
33long xfs_compat_ioctl(struct file *f, unsigned cmd, unsigned long arg); 33long linvfs_compat_ioctl(struct file *f, unsigned cmd, unsigned long arg);
34long xfs_compat_invis_ioctl(struct file *f, unsigned cmd, unsigned long arg); 34long linvfs_compat_invis_ioctl(struct file *f, unsigned cmd, unsigned long arg);