diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-04-03 11:07:29 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-04-03 11:07:29 -0400 |
| commit | efc33ce197e4b6aaddf1eb2ba6293f51daf3c283 (patch) | |
| tree | 9eaceed3c855d5cbc91c2fc247bdcceafbf28cdf /fs/fuse/control.c | |
| parent | 993884f6a26c6547fa3875f9d3fabdc4250d8da6 (diff) | |
| parent | 690a863ff03d9a29ace2b752b8f802fba78a842f (diff) | |
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/fuse/control.c')
| -rw-r--r-- | fs/fuse/control.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/fuse/control.c b/fs/fuse/control.c index b7978b9f75ef..a0b0855d00a9 100644 --- a/fs/fuse/control.c +++ b/fs/fuse/control.c | |||
| @@ -341,6 +341,7 @@ static struct file_system_type fuse_ctl_fs_type = { | |||
| 341 | .mount = fuse_ctl_mount, | 341 | .mount = fuse_ctl_mount, |
| 342 | .kill_sb = fuse_ctl_kill_sb, | 342 | .kill_sb = fuse_ctl_kill_sb, |
| 343 | }; | 343 | }; |
| 344 | MODULE_ALIAS_FS("fusectl"); | ||
| 344 | 345 | ||
| 345 | int __init fuse_ctl_init(void) | 346 | int __init fuse_ctl_init(void) |
| 346 | { | 347 | { |