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_super.c | |
| parent | 8aadff7dd519800ce7c0e7fb75dcd4438b373134 (diff) | |
| parent | 66f5507133f97088e553b1c8f8d341a0efd438f9 (diff) | |
| download | blackbird-op-linux-254feb882a7c6e4e51416dff6a97d847fbbba551.tar.gz blackbird-op-linux-254feb882a7c6e4e51416dff6a97d847fbbba551.zip | |
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_super.c')
| -rw-r--r-- | fs/xfs/linux-2.6/xfs_super.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/xfs/linux-2.6/xfs_super.c b/fs/xfs/linux-2.6/xfs_super.c index 53dc658cafa6..455e2b2fb964 100644 --- a/fs/xfs/linux-2.6/xfs_super.c +++ b/fs/xfs/linux-2.6/xfs_super.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2004 Silicon Graphics, Inc. All Rights Reserved. + * Copyright (c) 2000-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 @@ -66,7 +66,6 @@ #include "xfs_buf_item.h" #include "xfs_utils.h" #include "xfs_version.h" -#include "xfs_ioctl32.h" #include <linux/namei.h> #include <linux/init.h> |
