diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-18 17:34:14 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-18 17:34:14 +0100 |
| commit | c45bb8cb72136bf23d18926113bff04c8cc90813 (patch) | |
| tree | ae49a32f9c2536383c50d426c2eba1c7da1f22cf /fs/qnx6/inode.c | |
| parent | staging: comedi: ni_labpc: fix common detach (diff) | |
| parent | Linux 3.9-rc3 (diff) | |
| download | linux-c45bb8cb72136bf23d18926113bff04c8cc90813.tar.xz linux-c45bb8cb72136bf23d18926113bff04c8cc90813.zip | |
Merge 3.9-rc3 into staging-next
This resolves the merge error due to removing the ccg staging driver,
and picks up the other staging driver fixes that went into 3.9-rc3.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/qnx6/inode.c')
| -rw-r--r-- | fs/qnx6/inode.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/qnx6/inode.c b/fs/qnx6/inode.c index 57199a52a351..8d941edfefa1 100644 --- a/fs/qnx6/inode.c +++ b/fs/qnx6/inode.c @@ -672,6 +672,7 @@ static struct file_system_type qnx6_fs_type = { .kill_sb = kill_block_super, .fs_flags = FS_REQUIRES_DEV, }; +MODULE_ALIAS_FS("qnx6"); static int __init init_qnx6_fs(void) { |