diff options
| author | Mark Brown <broonie@kernel.org> | 2015-02-20 14:29:33 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-02-20 14:29:33 +0900 |
| commit | def31719e14fb7866fa243c453393ca7b90cca73 (patch) | |
| tree | ea649cfa349743537273675c17de8353d8a3f11b /fs/pstore/internal.h | |
| parent | 0fa60a2e6ac995035e785a817982679ff4cb4d7f (diff) | |
| parent | 855267e97aab7a25fb3aaa27f8080a0792fb3011 (diff) | |
Merge remote-tracking branch 'lsk/v3.10/topic/aosp' into linux-linaro-lsk-android
Conflicts:
drivers/Kconfig
drivers/Makefile
fs/pstore/inode.c
fs/pstore/ram.c
Diffstat (limited to 'fs/pstore/internal.h')
| -rw-r--r-- | fs/pstore/internal.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/fs/pstore/internal.h b/fs/pstore/internal.h index 937d820f273c..fd8d248c285c 100644 --- a/fs/pstore/internal.h +++ b/fs/pstore/internal.h @@ -45,6 +45,12 @@ extern void pstore_register_ftrace(void); static inline void pstore_register_ftrace(void) {} #endif +#ifdef CONFIG_PSTORE_PMSG +extern void pstore_register_pmsg(void); +#else +static inline void pstore_register_pmsg(void) {} +#endif + extern struct pstore_info *psinfo; extern void pstore_set_kmsg_bytes(int); |