diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-03 13:22:44 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-03 13:22:51 -0400 |
| commit | 89cab4624a8c0ed81a1b74b6f8c884641cac5b9d (patch) | |
| tree | 3a2f1ae599ee4bae60ccf11cc154d73c210c6388 /include/linux/fs_struct.h | |
| parent | 2e1cc199fc8666ac5fda200e8a99f1e4dea07175 (diff) | |
| parent | c6f9b1eb0e5df468891eff17f981b76c86f95f3a (diff) | |
ASoC: core: Merge Samsung fixes to avoid trivial context conflict
Merge branch 'fix/samsung' of
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into
asoc-component to resolve trivial conflict
Conflicts:
sound/soc/samsung/i2s.c
Diffstat (limited to 'include/linux/fs_struct.h')
| -rw-r--r-- | include/linux/fs_struct.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/fs_struct.h b/include/linux/fs_struct.h index 729eded4b24f..2b93a9a5a1e6 100644 --- a/include/linux/fs_struct.h +++ b/include/linux/fs_struct.h | |||
| @@ -50,4 +50,6 @@ static inline void get_fs_root_and_pwd(struct fs_struct *fs, struct path *root, | |||
| 50 | spin_unlock(&fs->lock); | 50 | spin_unlock(&fs->lock); |
| 51 | } | 51 | } |
| 52 | 52 | ||
| 53 | extern bool current_chrooted(void); | ||
| 54 | |||
| 53 | #endif /* _LINUX_FS_STRUCT_H */ | 55 | #endif /* _LINUX_FS_STRUCT_H */ |