diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-27 09:26:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-27 09:26:10 -0700 |
| commit | 254feb882a7c6e4e51416dff6a97d847fbbba551 (patch) | |
| tree | ad2516671b031a8e0b3f9a656a16c13c3f03d61c /fs/xfs/linux-2.6/xfs_ioctl32.h | |
| parent | 8aadff7dd519800ce7c0e7fb75dcd4438b373134 (diff) | |
| parent | 66f5507133f97088e553b1c8f8d341a0efd438f9 (diff) | |
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/hch/xfs-2.6
Diffstat (limited to 'fs/xfs/linux-2.6/xfs_ioctl32.h')
| -rw-r--r-- | fs/xfs/linux-2.6/xfs_ioctl32.h | 6 |
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 779f69a4811..c874793a1dc 100644 --- a/fs/xfs/linux-2.6/xfs_ioctl32.h +++ b/fs/xfs/linux-2.6/xfs_ioctl32.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004 Silicon Graphics, Inc. All Rights Reserved. + * Copyright (c) 2004-2005 Silicon Graphics, Inc. All Rights Reserved. * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as @@ -30,5 +30,5 @@ * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ -long xfs_compat_ioctl(struct file *f, unsigned cmd, unsigned long arg); -long xfs_compat_invis_ioctl(struct file *f, unsigned cmd, unsigned long arg); +long linvfs_compat_ioctl(struct file *f, unsigned cmd, unsigned long arg); +long linvfs_compat_invis_ioctl(struct file *f, unsigned cmd, unsigned long arg); |