diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-14 01:57:09 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-14 01:57:09 +0200 |
| commit | 89a86a2da30a6a90dda719874092905cd762b7ef (patch) | |
| tree | 140a289a990e7810e9c365bce304af1e065ca649 /fs/pstore/inode.c | |
| parent | staging: android: alarm: remove unnecessary goto statement (diff) | |
| parent | pstore/inode: Make pstore_fill_super() static (diff) | |
| download | linux-89a86a2da30a6a90dda719874092905cd762b7ef.tar.xz linux-89a86a2da30a6a90dda719874092905cd762b7ef.zip | |
Merge branch 'staging-linus' into staging-next
We need this for the pstore fixes that went into the staging-linus branch, so
that things apply properly for the pstore/android code merge.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/pstore/inode.c')
| -rw-r--r-- | fs/pstore/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/pstore/inode.c b/fs/pstore/inode.c index aeb19e68e086..11a2aa2a56c4 100644 --- a/fs/pstore/inode.c +++ b/fs/pstore/inode.c @@ -258,7 +258,7 @@ fail: return rc; } -int pstore_fill_super(struct super_block *sb, void *data, int silent) +static int pstore_fill_super(struct super_block *sb, void *data, int silent) { struct inode *inode; |