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/qnx4 | |
| 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/qnx4')
| -rw-r--r-- | fs/qnx4/inode.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/qnx4/inode.c b/fs/qnx4/inode.c index 43098bb5723a..2e8caa62da78 100644 --- a/fs/qnx4/inode.c +++ b/fs/qnx4/inode.c | |||
| @@ -412,6 +412,7 @@ static struct file_system_type qnx4_fs_type = { | |||
| 412 | .kill_sb = kill_block_super, | 412 | .kill_sb = kill_block_super, |
| 413 | .fs_flags = FS_REQUIRES_DEV, | 413 | .fs_flags = FS_REQUIRES_DEV, |
| 414 | }; | 414 | }; |
| 415 | MODULE_ALIAS_FS("qnx4"); | ||
| 415 | 416 | ||
| 416 | static int __init init_qnx4_fs(void) | 417 | static int __init init_qnx4_fs(void) |
| 417 | { | 418 | { |