diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-03-14 22:55:59 (GMT) |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-03-14 22:55:59 (GMT) |
| commit | 7ac6c89189c669fd5f883937f291f18d324d470b (patch) | |
| tree | 5f0712bdedac45a40148ede0064d4e6eddb4260e /arch/s390/hypfs/inode.c | |
| parent | 6fdd496e07f511a94ba27e4a1433038b32d6af05 (diff) | |
| parent | 0ed66befaae893e82c9f016238282d73ef9fd6c7 (diff) | |
| download | linux-fsl-qoriq-7ac6c89189c669fd5f883937f291f18d324d470b.tar.xz | |
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 'arch/s390/hypfs/inode.c')
| -rw-r--r-- | arch/s390/hypfs/inode.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/s390/hypfs/inode.c b/arch/s390/hypfs/inode.c index 8538015..5f7d7ba 100644 --- a/arch/s390/hypfs/inode.c +++ b/arch/s390/hypfs/inode.c @@ -456,6 +456,7 @@ static struct file_system_type hypfs_type = { .mount = hypfs_mount, .kill_sb = hypfs_kill_super }; +MODULE_ALIAS_FS("s390_hypfs"); static const struct super_operations hypfs_s_ops = { .statfs = simple_statfs, |