summaryrefslogtreecommitdiffstats
path: root/fs/binfmt_misc.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-09-16 07:33:21 +0200
committerTakashi Iwai <tiwai@suse.de>2010-09-16 07:33:21 +0200
commitc91925db4925ba0d145478f02c093369196936e9 (patch)
tree0e5da4211de3c18b65337c3094ec15994cf2534a /fs/binfmt_misc.c
parent977ddd6b2e63716cfefe669bbdb30ec0bcea1fe4 (diff)
parent3894335876a6257ac46e14845bd37ae6fb0f7c87 (diff)
downloadlinux-c91925db4925ba0d145478f02c093369196936e9.tar.gz
linux-c91925db4925ba0d145478f02c093369196936e9.tar.bz2
linux-c91925db4925ba0d145478f02c093369196936e9.zip
Merge branch 'fix/hda' into topic/hda
Diffstat (limited to 'fs/binfmt_misc.c')
-rw-r--r--fs/binfmt_misc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/binfmt_misc.c b/fs/binfmt_misc.c
index a7528b913936..fd0cc0bf9a40 100644
--- a/fs/binfmt_misc.c
+++ b/fs/binfmt_misc.c
@@ -724,7 +724,7 @@ static int __init init_misc_binfmt(void)
{
int err = register_filesystem(&bm_fs_type);
if (!err) {
- err = register_binfmt(&misc_format);
+ err = insert_binfmt(&misc_format);
if (err)
unregister_filesystem(&bm_fs_type);
}