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 /include/linux/pstore.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 'include/linux/pstore.h')
| -rw-r--r-- | include/linux/pstore.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/pstore.h b/include/linux/pstore.h index 75d01760c911..289884121d30 100644 --- a/include/linux/pstore.h +++ b/include/linux/pstore.h @@ -35,6 +35,7 @@ enum pstore_type_id { PSTORE_TYPE_MCE = 1, PSTORE_TYPE_CONSOLE = 2, PSTORE_TYPE_FTRACE = 3, + PSTORE_TYPE_PMSG = 4, /* Backport: 7 in upstream 3.19.0-rc3 */ PSTORE_TYPE_UNKNOWN = 255 }; |