diff options
author | Kukjin Kim <kgene.kim@samsung.com> | 2013-04-08 12:10:13 -0400 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2013-04-08 12:10:13 -0400 |
commit | da821eb7d42935b0f7056d98c75fd1150f6636f4 (patch) | |
tree | de83ac171d51bbe7621110c3145a68c198b13711 /fs/bfs | |
parent | 296f3f2c9322480400338f71d8c118107f9a7f20 (diff) | |
parent | 07961ac7c0ee8b546658717034fe692fd12eefa9 (diff) |
Merge commit 'v3.9-rc5' into next/clk-exynos
Conflicts:
arch/arm/boot/dts/exynos4.dtsi
arch/arm/boot/dts/exynos5440.dtsi
Diffstat (limited to 'fs/bfs')
-rw-r--r-- | fs/bfs/inode.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/bfs/inode.c b/fs/bfs/inode.c index 737aaa3f7090..5e376bb93419 100644 --- a/fs/bfs/inode.c +++ b/fs/bfs/inode.c | |||
@@ -473,6 +473,7 @@ static struct file_system_type bfs_fs_type = { | |||
473 | .kill_sb = kill_block_super, | 473 | .kill_sb = kill_block_super, |
474 | .fs_flags = FS_REQUIRES_DEV, | 474 | .fs_flags = FS_REQUIRES_DEV, |
475 | }; | 475 | }; |
476 | MODULE_ALIAS_FS("bfs"); | ||
476 | 477 | ||
477 | static int __init init_bfs_fs(void) | 478 | static int __init init_bfs_fs(void) |
478 | { | 479 | { |