diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-03-14 18:55:59 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-03-14 18:55:59 -0400 |
| commit | 7ac6c89189c669fd5f883937f291f18d324d470b (patch) | |
| tree | 5f0712bdedac45a40148ede0064d4e6eddb4260e /fs/befs/linuxvfs.c | |
| parent | 6fdd496e07f511a94ba27e4a1433038b32d6af05 (diff) | |
| parent | 0ed66befaae893e82c9f016238282d73ef9fd6c7 (diff) | |
Merge tag 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixes
From Nicolas Ferre <nicolas.ferre@atmel.com>:
Two patches for Device Tree on at91sam9x5/NAND.
Two more for fixing PM suspend/resume IRQ on AIC5 and
GPIO used with pinctrl.
* tag 'at91-fixes' of git://github.com/at91linux/linux-at91:
ARM: at91: fix infinite loop in at91_irq_suspend/resume
ARM: at91: add gpio suspend/resume support when using pinctrl
ARM: at91: dt: at91sam9x5: complete NAND pinctrl
ARM: at91: dt: at91sam9x5: correct NAND pins comments
Includes an update to -rc2
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'fs/befs/linuxvfs.c')
| -rw-r--r-- | fs/befs/linuxvfs.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c index c8f4e25eb9e2..8615ee89ab55 100644 --- a/fs/befs/linuxvfs.c +++ b/fs/befs/linuxvfs.c | |||
| @@ -951,6 +951,7 @@ static struct file_system_type befs_fs_type = { | |||
| 951 | .kill_sb = kill_block_super, | 951 | .kill_sb = kill_block_super, |
| 952 | .fs_flags = FS_REQUIRES_DEV, | 952 | .fs_flags = FS_REQUIRES_DEV, |
| 953 | }; | 953 | }; |
| 954 | MODULE_ALIAS_FS("befs"); | ||
| 954 | 955 | ||
| 955 | static int __init | 956 | static int __init |
| 956 | init_befs_fs(void) | 957 | init_befs_fs(void) |