summaryrefslogtreecommitdiff
path: root/fs/squashfs/super.c
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2013-04-24 08:11:20 +0400
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2013-04-24 08:11:20 +0400
commit973e2abd15326114ff9a099d6dfe0ef6be6fc7e6 (patch)
tree06ef7573e06500a4999a755006eb9a95bdf85ffa /fs/squashfs/super.c
parent5676005acf26ab7e924a8438ea4746e47d405762 (diff)
parent016af59f0f8cd10f27773df8f0034b5f3b46a138 (diff)
downloadlinux-973e2abd15326114ff9a099d6dfe0ef6be6fc7e6.tar.xz
Merge remote-tracking branch 'mpe/master' into next
Merge the tentative powerpc-next branch maintained by Michael while I was on vacation
Diffstat (limited to 'fs/squashfs/super.c')
-rw-r--r--fs/squashfs/super.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/squashfs/super.c b/fs/squashfs/super.c
index 260e3928d4f5..60553a9053ca 100644
--- a/fs/squashfs/super.c
+++ b/fs/squashfs/super.c
@@ -489,6 +489,7 @@ static struct file_system_type squashfs_fs_type = {
.kill_sb = kill_block_super,
.fs_flags = FS_REQUIRES_DEV
};
+MODULE_ALIAS_FS("squashfs");
static const struct super_operations squashfs_super_ops = {
.alloc_inode = squashfs_alloc_inode,