Merge tag 'mfd-for-linus-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd

[mirror_ubuntu-zesty-kernel.git] / include / linux / pstore.h

diff --git a/include/linux/pstore.h b/include/linux/pstore.h
index 8884f6e507f7c7797b8cce98349e45f3b732a9b8..831479f8df8f1b70638d59edc3cde6fc6fdcc22f 100644 (file)
--- a/include/linux/pstore.h
+++ b/include/linux/pstore.h
@@ -40,6 +40,7 @@ enum pstore_type_id {
        PSTORE_TYPE_PPC_OF      = 5,
        PSTORE_TYPE_PPC_COMMON  = 6,
        PSTORE_TYPE_PMSG        = 7,
+       PSTORE_TYPE_PPC_OPAL    = 8,
        PSTORE_TYPE_UNKNOWN     = 255
 };
 
@@ -74,20 +75,8 @@ struct pstore_info {
 
 #define        PSTORE_FLAGS_FRAGILE    1
 
-#ifdef CONFIG_PSTORE
 extern int pstore_register(struct pstore_info *);
+extern void pstore_unregister(struct pstore_info *);
 extern bool pstore_cannot_block_path(enum kmsg_dump_reason reason);
-#else
-static inline int
-pstore_register(struct pstore_info *psi)
-{
-       return -ENODEV;
-}
-static inline bool
-pstore_cannot_block_path(enum kmsg_dump_reason reason)
-{
-       return false;
-}
-#endif
 
 #endif /*_LINUX_PSTORE_H*/