summaryrefslogtreecommitdiffstats
path: root/fs/isofs/inode.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-03-22 00:07:34 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-03-22 00:07:34 +0100
commit23a376f98c5dcfc392d47e8d1872884ff44e585d (patch)
treedbe476151bbd6530369c40746f2ec2365f7b500a /fs/isofs/inode.c
parentdriver: tty: vt: remove cast for kmalloc return value (diff)
parentLinux 3.9-rc3 (diff)
downloadlinux-23a376f98c5dcfc392d47e8d1872884ff44e585d.tar.xz
linux-23a376f98c5dcfc392d47e8d1872884ff44e585d.zip
Merge 3.9-rc3 into tty-next
Diffstat (limited to 'fs/isofs/inode.c')
-rw-r--r--fs/isofs/inode.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/isofs/inode.c b/fs/isofs/inode.c
index a67f16e846a2..d9b8aebdeb22 100644
--- a/fs/isofs/inode.c
+++ b/fs/isofs/inode.c
@@ -1557,6 +1557,7 @@ static struct file_system_type iso9660_fs_type = {
.fs_flags = FS_REQUIRES_DEV,
};
MODULE_ALIAS_FS("iso9660");
+MODULE_ALIAS("iso9660");
static int __init init_iso9660_fs(void)
{