diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-04-03 17:07:29 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-04-03 17:07:29 +0200 |
| commit | efc33ce197e4b6aaddf1eb2ba6293f51daf3c283 (patch) | |
| tree | 9eaceed3c855d5cbc91c2fc247bdcceafbf28cdf /fs/ocfs2/dlmfs/dlmfs.c | |
| parent | 993884f6a26c6547fa3875f9d3fabdc4250d8da6 (diff) | |
| parent | 690a863ff03d9a29ace2b752b8f802fba78a842f (diff) | |
| download | linux-efc33ce197e4b6aaddf1eb2ba6293f51daf3c283.tar.bz2 | |
Merge branch 'for-linus' into for-next
Back-merge for cleaning up usb-audio code the recent commit modified,
and further UAC2 autoclock patches.
Diffstat (limited to 'fs/ocfs2/dlmfs/dlmfs.c')
| -rw-r--r-- | fs/ocfs2/dlmfs/dlmfs.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/ocfs2/dlmfs/dlmfs.c b/fs/ocfs2/dlmfs/dlmfs.c index 4c5fc8d77dc2..12bafb7265ce 100644 --- a/fs/ocfs2/dlmfs/dlmfs.c +++ b/fs/ocfs2/dlmfs/dlmfs.c @@ -640,6 +640,7 @@ static struct file_system_type dlmfs_fs_type = { .mount = dlmfs_mount, .kill_sb = kill_litter_super, }; +MODULE_ALIAS_FS("ocfs2_dlmfs"); static int __init init_dlmfs_fs(void) { |