Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[firefly-linux-kernel-4.4.55.git] / include / linux / pstore.h

diff --git a/include/linux/pstore.h b/include/linux/pstore.h
index 8e7a25b068b0925e4084c78f87d658d5758e518f..831479f8df8f1b70638d59edc3cde6fc6fdcc22f 100644 (file)
--- a/include/linux/pstore.h
+++ b/include/linux/pstore.h
@@ -75,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*/