summaryrefslogtreecommitdiff
path: root/fs/hppfs/hppfs.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2013-04-03 19:07:29 +0400
committerTakashi Iwai <tiwai@suse.de>2013-04-03 19:07:29 +0400
commitefc33ce197e4b6aaddf1eb2ba6293f51daf3c283 (patch)
tree9eaceed3c855d5cbc91c2fc247bdcceafbf28cdf /fs/hppfs/hppfs.c
parent993884f6a26c6547fa3875f9d3fabdc4250d8da6 (diff)
parent690a863ff03d9a29ace2b752b8f802fba78a842f (diff)
downloadlinux-efc33ce197e4b6aaddf1eb2ba6293f51daf3c283.tar.xz
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/hppfs/hppfs.c')
-rw-r--r--fs/hppfs/hppfs.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/hppfs/hppfs.c b/fs/hppfs/hppfs.c
index 74f55703be49..126d3c2e2dee 100644
--- a/fs/hppfs/hppfs.c
+++ b/fs/hppfs/hppfs.c
@@ -748,6 +748,7 @@ static struct file_system_type hppfs_type = {
.kill_sb = kill_anon_super,
.fs_flags = 0,
};
+MODULE_ALIAS_FS("hppfs");
static int __init init_hppfs(void)
{