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/adfs/super.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/adfs/super.c')
| -rw-r--r-- | fs/adfs/super.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/adfs/super.c b/fs/adfs/super.c index d57122935793..0ff4bae2c2a2 100644 --- a/fs/adfs/super.c +++ b/fs/adfs/super.c | |||
| @@ -524,6 +524,7 @@ static struct file_system_type adfs_fs_type = { | |||
| 524 | .kill_sb = kill_block_super, | 524 | .kill_sb = kill_block_super, |
| 525 | .fs_flags = FS_REQUIRES_DEV, | 525 | .fs_flags = FS_REQUIRES_DEV, |
| 526 | }; | 526 | }; |
| 527 | MODULE_ALIAS_FS("adfs"); | ||
| 527 | 528 | ||
| 528 | static int __init init_adfs_fs(void) | 529 | static int __init init_adfs_fs(void) |
| 529 | { | 530 | { |