diff options
| author | Simon Horman <horms+renesas@verge.net.au> | 2013-04-02 11:08:34 +0900 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2013-04-02 11:08:34 +0900 |
| commit | 809609a5d8427b0025304dbb69a84a692d11c4f9 (patch) | |
| tree | 95a544cda32d36e4a9ee1ce27c527406c54d91b4 /fs/autofs4/init.c | |
| parent | a4339a9cb46644e19278e4dd5d89b262a37cb0b0 (diff) | |
| parent | 8585deb18580d04209a2986430aa0959ef38fce2 (diff) | |
| download | talos-obmc-linux-809609a5d8427b0025304dbb69a84a692d11c4f9.tar.gz talos-obmc-linux-809609a5d8427b0025304dbb69a84a692d11c4f9.zip | |
Merge branch 'soc' into pinmux-base
Conflicts:
drivers/pinctrl/sh-pfc/pfc-r8a7740.c
This merge is to provide r8a73a4 SoC files, which are added in the
soc branch and depended on by r8a73a4 pfc-changes which are to
be added to the pinmux branch.
Diffstat (limited to 'fs/autofs4/init.c')
| -rw-r--r-- | fs/autofs4/init.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/autofs4/init.c b/fs/autofs4/init.c index cddc74b9cdb2..b3db517e89ec 100644 --- a/fs/autofs4/init.c +++ b/fs/autofs4/init.c @@ -26,6 +26,7 @@ static struct file_system_type autofs_fs_type = { .mount = autofs_mount, .kill_sb = autofs4_kill_sb, }; +MODULE_ALIAS_FS("autofs"); static int __init init_autofs4_fs(void) { |
