diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-03-21 06:03:10 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-03-21 06:03:10 -0400 |
| commit | 3bf2391729822e591dcfbbd1e9dd2f450968cdcb (patch) | |
| tree | 80a0499e57a4cc95b6caea559400b5226ebe606f /fs/ncpfs/inode.c | |
| parent | 86e213e1d901fbeaf6e57d13c5edd925fadddcbe (diff) | |
| parent | fd4a5aef002bb57e8a35ed34d8a878034b9bde94 (diff) | |
Merge branch 'perf/urgent' into perf/core
Merge in all pending fixes, before pulling the latest development
bits from Arnaldo - which will involve merge conflicts.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs/ncpfs/inode.c')
| -rw-r--r-- | fs/ncpfs/inode.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/ncpfs/inode.c b/fs/ncpfs/inode.c index 7dafd6899a62..26910c8154da 100644 --- a/fs/ncpfs/inode.c +++ b/fs/ncpfs/inode.c | |||
| @@ -1051,6 +1051,7 @@ static struct file_system_type ncp_fs_type = { | |||
| 1051 | .kill_sb = kill_anon_super, | 1051 | .kill_sb = kill_anon_super, |
| 1052 | .fs_flags = FS_BINARY_MOUNTDATA, | 1052 | .fs_flags = FS_BINARY_MOUNTDATA, |
| 1053 | }; | 1053 | }; |
| 1054 | MODULE_ALIAS_FS("ncpfs"); | ||
| 1054 | 1055 | ||
| 1055 | static int __init init_ncp_fs(void) | 1056 | static int __init init_ncp_fs(void) |
| 1056 | { | 1057 | { |