diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2010-12-23 08:41:14 +0100 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2010-12-23 08:41:14 +0100 |
commit | cfb13c5db08c90311a5defdde9a0328ee788cca5 (patch) | |
tree | 842cb60d1d19b99e550fdbc653723e4b13e51ee5 /fs/openpromfs/inode.c | |
parent | of/net: Move of_get_mac_address() to a common source file. (diff) | |
parent | Linux 2.6.37-rc7 (diff) | |
download | linux-cfb13c5db08c90311a5defdde9a0328ee788cca5.tar.xz linux-cfb13c5db08c90311a5defdde9a0328ee788cca5.zip |
Merge commit 'v2.6.37-rc7' into devicetree/next
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: static struct dentry *openprom_mount(struct file_system_type *fs_type, int flags, const char *dev_name, void *data) { - return mount_single(fs_type, flags, data, openprom_fill_super) + return mount_single(fs_type, flags, data, openprom_fill_super); } static struct file_system_type openprom_fs_type = { |