diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-11-18 03:35:56 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-11-18 03:35:56 -0500 |
| commit | 0421860a5a75b59a76b7a864a172eb090e3d0785 (patch) | |
| tree | df22f28abfa4c8bb77d650b674a44e0aedc586be /fs/openpromfs/inode.c | |
| parent | cf655c36fad7b6488a56f18ab56f7d608ca6552b (diff) | |
| parent | 89ba4d12fca24d373e1b10fce498d68157bafaf0 (diff) | |
Merge branch 'rmobile/ag5' into rmobile-latest
Diffstat (limited to 'fs/openpromfs/inode.c')
| -rw-r--r-- | fs/openpromfs/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/openpromfs/inode.c b/fs/openpromfs/inode.c index ddb1f41376e5..911e61f348fc 100644 --- a/fs/openpromfs/inode.c +++ b/fs/openpromfs/inode.c | |||
| @@ -418,7 +418,7 @@ out_no_root: | |||
| 418 | static struct dentry *openprom_mount(struct file_system_type *fs_type, | 418 | static struct dentry *openprom_mount(struct file_system_type *fs_type, |
| 419 | int flags, const char *dev_name, void *data) | 419 | int flags, const char *dev_name, void *data) |
| 420 | { | 420 | { |
| 421 | return mount_single(fs_type, flags, data, openprom_fill_super) | 421 | return mount_single(fs_type, flags, data, openprom_fill_super); |
| 422 | } | 422 | } |
| 423 | 423 | ||
| 424 | static struct file_system_type openprom_fs_type = { | 424 | static struct file_system_type openprom_fs_type = { |