diff options
| author | Mark Brown <broonie@kernel.org> | 2015-02-20 14:27:48 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-02-20 14:27:48 +0900 |
| commit | 855267e97aab7a25fb3aaa27f8080a0792fb3011 (patch) | |
| tree | 5409f76605c8227e46070295f2bf97d87f2dcc9e /include/linux/pstore.h | |
| parent | d88f67b8441516e42e59a064546ac3a78a992d82 (diff) | |
| parent | ecfe0b5f15b23de6fea4ed4d0bc9ef27c382c0cb (diff) | |
Merge branch 'linaro-android-3.10-lsk' of git://android.git.linaro.org/kernel/linaro-android into lsk-v3.10-aospv3.10/topic/aosp
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 }; |