diff options
| author | Niv Sardi <xaiki@debian.org> | 2008-11-06 23:07:12 -0500 |
|---|---|---|
| committer | Niv Sardi <xaiki@debian.org> | 2008-11-06 23:07:12 -0500 |
| commit | dcd7b4e5c0649b1d2219399529b20de1df517e55 (patch) | |
| tree | ef00739e48ddda0a30061d62a7348ed4b0c9aeeb /kernel | |
| parent | 75fa67706cce5272bcfc51ed646f2da21f3bdb6e (diff) | |
| parent | 91b777125175077fb74025608dba87f100586c62 (diff) | |
Merge branch 'master' of git://oss.sgi.com:8090/xfs/linux-2.6
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/sysctl_check.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/sysctl_check.c b/kernel/sysctl_check.c index c35da23ab8fb..fafeb48f27c0 100644 --- a/kernel/sysctl_check.c +++ b/kernel/sysctl_check.c | |||
| @@ -730,7 +730,6 @@ static const struct trans_ctl_table trans_fs_quota_table[] = { | |||
| 730 | }; | 730 | }; |
| 731 | 731 | ||
| 732 | static const struct trans_ctl_table trans_fs_xfs_table[] = { | 732 | static const struct trans_ctl_table trans_fs_xfs_table[] = { |
| 733 | { XFS_RESTRICT_CHOWN, "restrict_chown" }, | ||
| 734 | { XFS_SGID_INHERIT, "irix_sgid_inherit" }, | 733 | { XFS_SGID_INHERIT, "irix_sgid_inherit" }, |
| 735 | { XFS_SYMLINK_MODE, "irix_symlink_mode" }, | 734 | { XFS_SYMLINK_MODE, "irix_symlink_mode" }, |
| 736 | { XFS_PANIC_MASK, "panic_mask" }, | 735 | { XFS_PANIC_MASK, "panic_mask" }, |