diff options
| author | David S. Miller <davem@davemloft.net> | 2013-03-12 09:52:22 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-03-12 09:52:22 (GMT) |
| commit | e5f2ef7ab4690d2e8faaf5fd203c5ecd70c3abaf (patch) | |
| tree | 3558f68717c70a67e18c3274bb17709a353d036f /fs/efs/super.c | |
| parent | 30129cf28a5c99f9cb7c168f0d280f147fd6cc8b (diff) | |
| parent | 3da889b616164bde76a37350cf28e0d17a94e979 (diff) | |
| download | linux-fsl-qoriq-e5f2ef7ab4690d2e8faaf5fd203c5ecd70c3abaf.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/intel/e1000e/netdev.c
Minor conflict in e1000e, a line that got fixed in 'net'
has been removed in 'net-next'.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'fs/efs/super.c')
| -rw-r--r-- | fs/efs/super.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/efs/super.c b/fs/efs/super.c index 2002431..c6f57a7 100644 --- a/fs/efs/super.c +++ b/fs/efs/super.c @@ -33,6 +33,7 @@ static struct file_system_type efs_fs_type = { .kill_sb = kill_block_super, .fs_flags = FS_REQUIRES_DEV, }; +MODULE_ALIAS_FS("efs"); static struct pt_types sgi_pt_types[] = { {0x00, "SGI vh"}, |